Merge "Define proguard dictionary output for R8"

am: 2f05802a78 Change-Id: I32f3fb1f8d64c61c6484d3dd28f82bd099721599
2017-10-26 06:19:53 +00:00 · 2017-10-26 06:19:53 +00:00 · 85a4b57d94
parent 6449fe47c4 2f05802a78
commit 85a4b57d94
1 changed files with 4 additions and 0 deletions
--- a/core/java.mk
+++ b/core/java.mk
@ -719,7 +719,11 @@ endif
 endif

 ifneq ($(filter obfuscation,$(LOCAL_PROGUARD_ENABLED)),)
+ifneq ($(USE_R8),true)
  $(full_classes_proguard_jar): .KATI_IMPLICIT_OUTPUTS := $(proguard_dictionary)
+else
+  $(built_dex_intermediate): .KATI_IMPLICIT_OUTPUTS := $(proguard_dictionary)
+endif
 endif

 # If R8 is not enabled run Proguard.