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

am: 0ef2d2f6c9

* commit '0ef2d2f6c9d48ced1f735014025c06e42c6ddd6b':
  Uncompress native libs only if they are compressed.

Change-Id: I4e3676544734eb05c1207210cbf49b3af459d8de
This commit is contained in:
Alex Klyubin 2016-05-18 16:30:51 +00:00 committed by android-build-merger
commit 10cc6914a8
1 changed files with 1 additions and 1 deletions

View File

@ -2580,7 +2580,7 @@ endif
# 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' && \