commit 128800f2c8d3f27d6ae29b9cb8e62cb26bcf5f2f
author Colin Cross <ccross@android.com> Thu Aug 10 15:24:10 2017 -0700
committer Colin Cross <ccross@android.com> Wed Aug 16 13:37:00 2017 -0700
tree 2d476b950477d6f1c42418bb1f55935fa46d8a18
parent 05ecd66557bebaaaa854f15693dbef214e3d8927

Sort files in directories passed to jar

jar -C <dir> . produces a jar containing files in filesystem order,
which can vary between builds.  Manually find and sort the list of
files, and convert them into a list of -C <dir> <file> pairs.

Fixes: 64634025
Test: m -j checkbuild
Test: m -j out/target/product/sailfish/system/framework/ext.jar, check
      that entries are sorted
Test: m -j out/target/product/generic_arm64/system/framework/ext.jar on mac
Change-Id: I7dced6acbe621a60cd49daf17872941485602732

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index c457bd8..8cc6fe6 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -445,6 +445,7 @@
         $(proto_java_sources_file_stamp) \
         $(annotation_processor_deps) \
         $(NORMALIZE_PATH) \
+        $(JAR_ARGS) \
         $(LOCAL_ADDITIONAL_DEPENDENCIES) \
         | $(SOONG_JAVAC_WRAPPER)
 	$(transform-java-to-classes.jar)