summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--applypatch/Android.bp32
-rw-r--r--tests/Android.bp5
-rw-r--r--updater/updater_runtime_dynamic_partitions.cpp2
3 files changed, 3 insertions, 36 deletions
diff --git a/applypatch/Android.bp b/applypatch/Android.bp
index 64dd38d24..42aa52954 100644
--- a/applypatch/Android.bp
+++ b/applypatch/Android.bp
@@ -168,35 +168,3 @@ cc_binary_host {
"libz",
],
}
-
-cc_library_static {
- name: "libimgpatch",
-
- // The host module is for recovery_host_test (Linux only).
- host_supported: true,
-
- defaults: [
- "applypatch_defaults",
- ],
-
- srcs: [
- "bspatch.cpp",
- "imgpatch.cpp",
- ],
-
- static_libs: [
- "libbase",
- "libbspatch",
- "libbz",
- "libcrypto",
- "libedify",
- "libotautil",
- "libz",
- ],
-
- target: {
- darwin: {
- enabled: false,
- },
- },
-}
diff --git a/tests/Android.bp b/tests/Android.bp
index 1801f3b5f..a86704015 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -50,12 +50,11 @@ cc_defaults {
},
}
-// libapplypatch, libapplypatch_modes, libimgpatch
+// libapplypatch, libapplypatch_modes
libapplypatch_static_libs = [
"libapplypatch_modes",
"libapplypatch",
"libedify",
- "libimgpatch",
"libotautil",
"libbsdiff",
"libbspatch",
@@ -180,7 +179,7 @@ cc_test_host {
target: {
darwin: {
- // libimgdiff is not available on the Mac.
+ // libapplypatch in "libupdater_defaults" is not available on the Mac.
enabled: false,
},
},
diff --git a/updater/updater_runtime_dynamic_partitions.cpp b/updater/updater_runtime_dynamic_partitions.cpp
index e9f4c97c9..b084f6592 100644
--- a/updater/updater_runtime_dynamic_partitions.cpp
+++ b/updater/updater_runtime_dynamic_partitions.cpp
@@ -53,7 +53,7 @@ static bool UnmapPartitionOnDeviceMapper(const std::string& partition_name) {
return true;
}
if (state == DmDeviceState::ACTIVE) {
- return DestroyLogicalPartition(partition_name, kMapTimeout);
+ return DestroyLogicalPartition(partition_name);
}
LOG(ERROR) << "Unknown device mapper state: "
<< static_cast<std::underlying_type_t<DmDeviceState>>(state);