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
This commit is contained in:
Alex Klyubin 2016-05-18 16:25:46 +00:00 committed by android-build-merger
commit 59fcd79e29
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' && \