commit 6e65019a456ab7ce8fecdf69ff01619d298b0656
author Søren Gjesse <sgjesse@google.com> Tue Apr 17 00:13:15 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Apr 17 00:13:15 2018 -0700
tree 9b55baf72ae63d2c30365bbfb7aadc8d8fe890e7
parent 313795532363eea2c2479c5d1f90505a473610a2
parent a246c6a84a8535ffca98b6c59b23a8d58a818f4d

Merge "Keep the collected Proguard configuration" am: 0c2a796853
am: a246c6a84a

Change-Id: I2eae581750bdb3fa51649c7b130e3169fa80877f

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index 3bafa15..6e745a0 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -404,6 +404,7 @@
     $(error invalid value for LOCAL_PROGUARD_ENABLED: $(LOCAL_PROGUARD_ENABLED))
 endif
 proguard_dictionary := $(intermediates.COMMON)/proguard_dictionary
+proguard_configuration := $(intermediates.COMMON)/proguard_configuration
 
 # When an app contains references to APIs that are not in the SDK specified by
 # its LOCAL_SDK_VERSION for example added by support library or by runtime
@@ -439,6 +440,7 @@
   $(filter-out $(my_proguard_sdk_raise),$(full_shared_java_header_libs))
 
 legacy_proguard_flags += -printmapping $(proguard_dictionary)
+legacy_proguard_flags += -printconfiguration $(proguard_configuration)
 
 common_proguard_flags := -forceprocessing
 
@@ -508,9 +510,9 @@
 
 ifneq ($(filter obfuscation,$(LOCAL_PROGUARD_ENABLED)),)
 ifneq ($(LOCAL_USE_R8),true)
-  $(full_classes_proguard_jar): .KATI_IMPLICIT_OUTPUTS := $(proguard_dictionary)
+  $(full_classes_proguard_jar): .KATI_IMPLICIT_OUTPUTS := $(proguard_dictionary) $(proguard_configuration)
 else
-  $(built_dex_intermediate): .KATI_IMPLICIT_OUTPUTS := $(proguard_dictionary)
+  $(built_dex_intermediate): .KATI_IMPLICIT_OUTPUTS := $(proguard_dictionary) $(proguard_configuration)
 endif
 endif