Merge "Define proguard dictionary output for R8"

am: 2f05802a78

Change-Id: I32f3fb1f8d64c61c6484d3dd28f82bd099721599
This commit is contained in:
Søren Gjesse
2017-10-26 06:19:53 +00:00
committed by android-build-merger

View File

@@ -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.