StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Define proguard dictionary output for R8"

Browse Source 
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
parent 6449fe47c4 2f05802a78
commit 85a4b57d94
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java.mk
View File

@@ -719,7 +719,11 @@ endif
endif endif
ifneq ($(filter obfuscation,$(LOCAL_PROGUARD_ENABLED)),) ifneq ($(filter obfuscation,$(LOCAL_PROGUARD_ENABLED)),)
ifneq ($(USE_R8),true)
$(full_classes_proguard_jar): .KATI_IMPLICIT_OUTPUTS := $(proguard_dictionary) $(full_classes_proguard_jar): .KATI_IMPLICIT_OUTPUTS := $(proguard_dictionary)
else
$(built_dex_intermediate): .KATI_IMPLICIT_OUTPUTS := $(proguard_dictionary)
endif
endif endif
# If R8 is not enabled run Proguard. # If R8 is not enabled run Proguard.