commit 779d7d3a3d7a3d9b150afe6a6e9b28317e7643af
author Xin Li <delphij@google.com> Tue Jul 02 10:01:34 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jul 02 10:01:34 2019 -0700
tree 56f101640cdb400eea15c75bf898f253bf5943ef
parent 304c3893606e978760236dbc245581ab8e81a085
parent 457f7ea2faba6335f2f395e950920006249710d1

[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
am: 457f7ea2fa -s ours
am skip reason: subject contains skip directive

Change-Id: Ib94a51bbc437761c7bbabb8f45d19102a57489d3

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