commit 59fcd79e29e9418b02f6ba3fbbbd3e2e45eb3785
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 25ba7b6677aba8701ab0c469c2752dc7b56f5064
parent 7ec97fdc1627c48ab7bb161f273aaeba33c850d1
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: I4c680cfb228774ce93e75c644e7eee5c40988399

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index cf6d0fe..74514bd 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2580,7 +2580,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' && \