commit 451b72438e974a10f3f9062ced5d455d3234e4dd
author TreeHugger Robot <treehugger-gerrit@google.com> Wed May 18 16:17:17 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 18 16:17:18 2016 +0000
tree 8bc269193f94e12a98c5471a2ee154e362171bdb
parent 9497f830a25f90ed63b06a2f2636a9c99edd9979
parent 587484abe553b44ccd3b53fffc7a8205705b6c40

Merge "Uncompress native libs only if they are compressed." into nyc-dev

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 5d24b67..e2d5de4 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2497,7 +2497,7 @@
 # Uncompress shared libraries embedded in an apk.
 #
 define uncompress-shared-libs
-$(hide) if unzip -l $@ $(PRIVATE_EMBEDDED_JNI_LIBS) >/dev/null ; then \
+$(hide) if (zipinfo $@ $(PRIVATE_EMBEDDED_JNI_LIBS) 2>/dev/null | grep -v ' stor ' >/dev/null) ; then \
   rm -rf $(dir $@)uncompressedlibs && mkdir $(dir $@)uncompressedlibs; \
   unzip $@ $(PRIVATE_EMBEDDED_JNI_LIBS) -d $(dir $@)uncompressedlibs && \
   zip -d $@ 'lib/*.so' && \