commit 5675b97f6591310d012a013a94a0ae9bd188d975
author Stephen Hines <srhines@google.com> Wed Jun 26 17:27:35 2013 -0700
committer Stephen Hines <srhines@google.com> Wed Jun 26 17:27:35 2013 -0700
tree 9fbffeab628e77c6689519191ed8a46ee0b9c371
parent 57b867f3f568b026833c6208afdeff2168838ffd

Switch to shared libpng/libz dependency.

Bug: 9593270
Change-Id: I1eec2590cca046d6e030c73d31a6b400019e1ebd

tools/aapt/Android.mk

diff --git a/tools/aapt/Android.mk b/tools/aapt/Android.mk
index 61180a0..3b49819 100644
--- a/tools/aapt/Android.mk
+++ b/tools/aapt/Android.mk
@@ -86,15 +86,17 @@
 LOCAL_CFLAGS += -DSTATIC_ANDROIDFW_FOR_TOOLS
 LOCAL_CFLAGS += -Wno-non-virtual-dtor
 
+LOCAL_SHARED_LIBRARIES := \
+        libpng \
+        libz
+
 LOCAL_STATIC_LIBRARIES := \
         libstlport_static \
         libandroidfw \
         libutils \
         libcutils \
         libexpat_static \
-        libpng \
-        liblog \
-        libz
+        liblog
 
 include $(BUILD_EXECUTABLE)
 endif