commit 96a782f1ea1275b242d8c58a0d5fdce735234aed
author Treehugger Robot <treehugger-gerrit@google.com> Tue Sep 26 21:45:28 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 26 21:45:28 2017 +0000
tree 175e85f179ac3331dcd09bfdcd771cba28b2665d
parent a4a1f2089bc25960793f34a68affa0f947844b96
parent bdd6a756d18a1d5f4a65b9006d9fae371868f811

Merge "Only define proguard dictionary as output if obfuscating"

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index d6c37e5..205d352 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -735,7 +735,9 @@
 endif
 endif
 
-$(full_classes_proguard_jar): .KATI_IMPLICIT_OUTPUTS := $(proguard_dictionary)
+ifneq ($(filter obfuscation,$(LOCAL_PROGUARD_ENABLED)),)
+  $(full_classes_proguard_jar): .KATI_IMPLICIT_OUTPUTS := $(proguard_dictionary)
+endif
 $(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)