commit eea3802b2c3e9a244a6e84fdfcdb7955bbe2ad2b
author Alex Klyubin <klyubin@google.com> Wed May 18 16:25:46 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 18 16:25:46 2016 +0000
tree dc709f3de6bde7eab899ae6398667c5a2953adca
parent 0125118f84dcffe3dae56d5a86dc86a20f488de4
parent 451b72438e974a10f3f9062ced5d455d3234e4dd

Merge "Uncompress native libs only if they are compressed." into nyc-dev
am: 451b72438e

* commit '451b72438e974a10f3f9062ced5d455d3234e4dd':
  Uncompress native libs only if they are compressed.

Change-Id: I9b4f21468db91955b021c744e83efba8b126dc0e

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' && \