commit 887c645e0257927666f7f40658aa6afed125de02
author Narayan Kamath <narayan@google.com> Mon Nov 06 11:40:07 2017 +0000
committer Dan Willemsen <dwillemsen@google.com> Mon Nov 06 11:12:08 2017 -0800
tree 1ccbb2559d3e20a4d744e5fbcedb8da3d10b0b51
parent bd532fbf2ebc1fe87f11374f61409312f42048da

zipalign: Fix build failure in static_sdk_tools.

Convert all dependencies to static deps.

Test: make -j50 static_sdk_tools BUILD_HOST_static=1
Bug: 35246701
Bug: 68804545

Change-Id: Ia46ac30e5c05226f1bfec82a84f05e4be945bf74

tools/zipalign/Android.bp

diff --git a/tools/zipalign/Android.bp b/tools/zipalign/Android.bp
index e80054a..8e6196d 100644
--- a/tools/zipalign/Android.bp
+++ b/tools/zipalign/Android.bp
@@ -15,19 +15,18 @@
 
     cflags: ["-Wall", "-Werror"],
 
+    // NOTE: Do not add any shared_libs dependencies because they will break the
+    // static_sdk_tools target.
     static_libs: [
         "libutils",
         "libcutils",
         "liblog",
+        "libziparchive",
+        "libz",
+        "libbase",
         "libzopfli",
     ],
 
-    shared_libs: [
-      "libbase",
-      "libz",
-      "libziparchive"
-    ],
-
     target: {
         windows: {
             host_ldlibs: ["-lpthread"],