commit 9fbdd9ec5a6a178519cbf82bf6ca2bcde4a54a31
author Søren Gjesse <sgjesse@google.com> Fri Apr 13 15:34:20 2018 +0200
committer Søren Gjesse <sgjesse@google.com> Mon Apr 16 09:16:35 2018 +0200
tree f91b2749c08a1a492d37e8de8d2108c94414894c
parent 93dcc11c179ca2b94721185533909eb1a7969f8d

Keep the collected Proguard configuration

This will work for both R8 and Proguard

Test: m -j Settings && "manually check .../proguard_coniguration file"
Change-Id: I1da7c3426b3511e2d5ad69852da8cec3245d7e54

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index dab5314..0361c83 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
@@ -434,6 +435,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
 
@@ -516,9 +518,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