commit b6fc0a1cae0e6627fd7be5bf2c65c2697e0754ce
author Colin Cross <ccross@android.com> Fri Sep 22 17:55:35 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 22 17:55:35 2017 +0000
tree 02b67400faf331be5fd7e5f17a74fab148fd5dd9
parent 58e0b8c0a3bde4298f86ae89a56285911d3c148d
parent 4a93294fc12eb24f2de5f2011bed4c14f6252e93

Merge "Support <dir>:<file> for LOCAL_JAVA_RESOURCE_FILES"

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 962c0f2..542db3e 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2290,9 +2290,7 @@
     --javacopts $(PRIVATE_JAVACFLAGS) $(COMMON_JDK_FLAGS) \
     $(addprefix --classpath ,$(strip \
         $(call normalize-path-list,$(PRIVATE_ALL_JAVA_HEADER_LIBRARIES)))) \
-    || ( rm -rf $(dir $@)/classes-turbine ; exit 41 ) \
-fi
-$(hide) if [ -s $@.premerged ] ; then \
+    || ( rm -rf $(dir $@)/classes-turbine ; exit 41 ) && \
     $(MERGE_ZIPS) -j -stripDir META-INF $@.tmp $@.premerged $(call reverse-list,$(PRIVATE_STATIC_JAVA_HEADER_LIBRARIES)) ; \
 else \
     $(MERGE_ZIPS) -j -stripDir META-INF $@.tmp $(call reverse-list,$(PRIVATE_STATIC_JAVA_HEADER_LIBRARIES)) ; \

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index f661f06..6d64991 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -716,6 +716,7 @@
 endif
 endif
 
+$(full_classes_proguard_jar): .KATI_IMPLICIT_OUTPUTS := $(proguard_dictionary)
 $(full_classes_proguard_jar): PRIVATE_PROGUARD_INJAR_FILTERS := $(proguard_injar_filters)
 $(full_classes_proguard_jar): PRIVATE_EXTRA_INPUT_JAR := $(extra_input_jar)
 $(full_classes_proguard_jar): PRIVATE_PROGUARD_FLAGS := $(legacy_proguard_flags) $(common_proguard_flags) $(LOCAL_PROGUARD_FLAGS)