Merge "Remove libimgpatch" am: ed96da6664

am: 36385bd9ee

Change-Id: I8ed0f92329550c4b643e8f52ad8471bce1e79769

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,
-        },
-    },
-}

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,
         },
     },