From 45c40ec87679570aa35be5d8a70e09dd8eeaf5ef Mon Sep 17 00:00:00 2001
From: Tianjie Xu <xunchang@google.com>
Date: Tue, 2 Jul 2019 15:09:24 -0700
Subject: Remove libimgpatch

Stop building libimgpatch as it's merely a subset of libapplypatch.

Test: unit tests pass

Change-Id: I0735ec053344404434a50e53a36e3f55964c2e4f
---
 applypatch/Android.bp | 32 --------------------------------
 tests/Android.bp      |  5 ++---
 2 files changed, 2 insertions(+), 35 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,
         },
     },
-- 
cgit v1.2.3