commit 3f99cd5933952e08f2fc085f98b4d8eac7ae5ada
author Colin Cross <ccross@android.com> Thu Mar 15 16:26:08 2018 -0700
committer Colin Cross <ccross@android.com> Thu Mar 15 16:40:05 2018 -0700
tree a7312cc8f821b3432f8b0368d768ac314071d255
parent 1f4f67201db60c5819a404bc54ce5e912c4a3ab6

Replace extract_srcjars.sh with zipsync

Use zipsync instead of extract_srcjars.sh.

Also fixes an issue where unzipping a resource zip would
ignore anything that wasn't a *.java file.

Bug: 73885582
Test: m checkbuild
Change-Id: I1c25f65afa196614879071c8655866febebac185

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index 907825c..e263906 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -465,7 +465,7 @@
     $(annotation_processor_deps) \
     $(NORMALIZE_PATH) \
     $(JAR_ARGS) \
-    $(EXTRACT_SRCJARS) \
+    $(ZIPSYNC) \
     | $(SOONG_JAVAC_WRAPPER)
 	@echo "Target Java: $@
 	$(call compile-java,$(TARGET_JAVAC),$(PRIVATE_ALL_JAVA_HEADER_LIBRARIES))