commit 5c64b4e81c1331cab56d8a8c201f26bb263b630c
author Dan Willemsen <dwillemsen@google.com> Wed Nov 11 18:20:37 2015 -0800
committer Dan Willemsen <dwillemsen@google.com> Wed Nov 11 18:26:38 2015 -0800
tree f9cb28ad8dbbc72cfa176c0d540e350c0cc653a0
parent 98c27a83da8caee0ed4e57c596d4f51e182588ef

Make uncompressing jni libs in prebuilt APKs reproducible

This was extracting the shared libraries into a temporary directory,
then adding them back into the zip file using the raw filesystem
ordering. Fix that by passing a sorted list to zip.

Bug: 24201956
Change-Id: I59c41151968be6faf289e04719a9992157eb405d

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 1c8f41a..eba3a3e 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2161,7 +2161,7 @@
   rm -rf $(dir $@)uncompressedlibs && mkdir $(dir $@)uncompressedlibs; \
   unzip $@ $(PRIVATE_EMBEDDED_JNI_LIBS) -d $(dir $@)uncompressedlibs && \
   zip -d $@ 'lib/*.so' && \
-  ( cd $(dir $@)uncompressedlibs && zip -D -r -X -0 ../$(notdir $@) lib ) && \
+  ( cd $(dir $@)uncompressedlibs && find lib -type f | sort | zip -D -X -0 ../$(notdir $@) -@ ) && \
   rm -rf $(dir $@)uncompressedlibs; \
   fi
 endef