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

Merge "Only define proguard dictionary as output if obfuscating" am: 96a782f1ea am: 13c0785b09

Browse Source 
am: 73acd38175

Change-Id: Iea98bc51e8dbeba0cb15ec460d5dda9db481b133
This commit is contained in:
Dan Willemsen
2017-09-26 21:55:49 +00:00
committed by android-build-merger
parent 69f05bb9d7 73acd38175
commit f031150a03
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java.mk
View File

@@ -748,7 +748,9 @@ endif
endif
endif
$(full_classes_proguard_jar): .KATI_IMPLICIT_OUTPUTS := $(proguard_dictionary)
ifneq ($(filter obfuscation,$(LOCAL_PROGUARD_ENABLED)),)
$(full_classes_proguard_jar): .KATI_IMPLICIT_OUTPUTS := $(proguard_dictionary)
endif
$(full_classes_proguard_jar): PRIVATE_PROGUARD_INJAR_FILTERS := $(proguard_injar_filters)
$(full_classes_proguard_jar): PRIVATE_EXTRA_INPUT_JAR := $(extra_input_jar)
$(full_classes_proguard_jar): PRIVATE_PROGUARD_FLAGS := $(legacy_proguard_flags) $(common_proguard_flags) $(LOCAL_PROGUARD_FLAGS)