Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a246c6a8 authored by Søren Gjesse's avatar Søren Gjesse Committed by android-build-merger
Browse files

Merge "Keep the collected Proguard configuration" 

am: 0c2a7968

Change-Id: Icbaef8854a012366cb8cbe9d647065bd85962665
parents b288560a 0c2a7968

core/java.mk

+4 −2
Original line number Original line Diff line number Diff line
@@ -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
@@ -434,6 +435,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
@@ -516,9 +518,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