commit 36385bd9eedd96d82e5cfeb8d9ec4e0280e84df4
author Tianjie Xu <xunchang@google.com> Wed Jul 10 18:04:27 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Jul 10 18:04:27 2019 -0700
tree 16df242234a5d4fd225181946845bae9f4f0b3f1
parent d9ec0bbd0658cf1d98675b1dba6a40c63b78a841
parent ed96da666466e44d31aac52faaaa34c18cb50ac3

Merge "Remove libimgpatch"
am: ed96da6664

Change-Id: Id263dad2ce56b5268af5e65ee8d1cc55d2967e56

applypatch/Android.bp

diff --git a/applypatch/Android.bp b/applypatch/Android.bp
index 64dd38d..42aa529 100644
--- a/applypatch/Android.bp
+++ b/applypatch/Android.bp
@@ -168,35 +168,3 @@
         "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,
-        },
-    },
-}

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index 1801f3b..a867040 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -50,12 +50,11 @@
     },
 }
 
-// libapplypatch, libapplypatch_modes, libimgpatch
+// libapplypatch, libapplypatch_modes
 libapplypatch_static_libs = [
     "libapplypatch_modes",
     "libapplypatch",
     "libedify",
-    "libimgpatch",
     "libotautil",
     "libbsdiff",
     "libbspatch",
@@ -180,7 +179,7 @@
 
     target: {
         darwin: {
-            // libimgdiff is not available on the Mac.
+            // libapplypatch in "libupdater_defaults" is not available on the Mac.
             enabled: false,
         },
     },