commit 317fc9a2f166f69bc6e989313ff034603224b2b7
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jul 02 07:41:03 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 02 07:41:03 2019 +0000
tree 56f101640cdb400eea15c75bf898f253bf5943ef
parent b84b6422fa64234689c5a9fed5258631c973ef9b
parent 457f7ea2faba6335f2f395e950920006249710d1

Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master" into stage-aosp-master

applypatch/Android.bp

diff --git a/applypatch/Android.bp b/applypatch/Android.bp
index 620ca6c..64dd38d 100644
--- a/applypatch/Android.bp
+++ b/applypatch/Android.bp
@@ -114,11 +114,9 @@
     ],
 }
 
-cc_library_static {
+cc_library_host_static {
     name: "libimgdiff",
 
-    host_supported: true,
-
     defaults: [
         "applypatch_defaults",
     ],

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index fec2f07..1801f3b 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -50,12 +50,11 @@
     },
 }
 
-// libapplypatch, libapplypatch_modes, libimgdiff, libimgpatch
+// libapplypatch, libapplypatch_modes, libimgpatch
 libapplypatch_static_libs = [
     "libapplypatch_modes",
     "libapplypatch",
     "libedify",
-    "libimgdiff",
     "libimgpatch",
     "libotautil",
     "libbsdiff",