openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Keep the collected Proguard configuration" am: 0c2a796853 

am: a246c6a84a

Change-Id: I2eae581750bdb3fa51649c7b130e3169fa80877f
This commit is contained in:
Søren Gjesse 2018-04-17 00:13:15 -07:00 committed by android-build-merger
parent 3137955323 a246c6a84a
commit 6e65019a45
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/java.mk
View File

@ -404,6 +404,7 @@ ifneq ($(filter-out full custom obfuscation optimization,$(LOCAL_PROGUARD_ENABLE
$(error invalid value for LOCAL_PROGUARD_ENABLED: $(LOCAL_PROGUARD_ENABLED)) $(error invalid value for LOCAL_PROGUARD_ENABLED: $(LOCAL_PROGUARD_ENABLED))
endif endif
proguard_dictionary := $(intermediates.COMMON)/proguard_dictionary 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 # 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 # its LOCAL_SDK_VERSION for example added by support library or by runtime
@ -439,6 +440,7 @@ legacy_proguard_lib_deps := $(my_proguard_sdk_raise) \
$(filter-out $(my_proguard_sdk_raise),$(full_shared_java_header_libs)) $(filter-out $(my_proguard_sdk_raise),$(full_shared_java_header_libs))
legacy_proguard_flags += -printmapping $(proguard_dictionary) legacy_proguard_flags += -printmapping $(proguard_dictionary)
legacy_proguard_flags += -printconfiguration $(proguard_configuration)
common_proguard_flags := -forceprocessing common_proguard_flags := -forceprocessing
@ -508,9 +510,9 @@ endif
ifneq ($(filter obfuscation,$(LOCAL_PROGUARD_ENABLED)),) ifneq ($(filter obfuscation,$(LOCAL_PROGUARD_ENABLED)),)
ifneq ($(LOCAL_USE_R8),true) 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 else
$(built_dex_intermediate): .KATI_IMPLICIT_OUTPUTS := $(proguard_dictionary) $(built_dex_intermediate): .KATI_IMPLICIT_OUTPUTS := $(proguard_dictionary) $(proguard_configuration)
endif endif
endif endif