commit dd24d65d2fb563d30db175ada8230978e81ba27f
author Tao Bao <tbao@google.com> Wed May 18 21:59:48 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 18 21:59:48 2016 +0000
tree 0684f0fff93e2012d8517450bcefb8880e0dac54
parent eea3802b2c3e9a244a6e84fdfcdb7955bbe2ad2b
parent 295ad1f1f160e229417d604e62483e1871f20f4a

Merge "Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1"" into nyc-mr1-dev

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 1808101..a46dfbc 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2500,7 +2500,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' && \