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

Commit 66013976 authored by Søren Gjesse's avatar Søren Gjesse Committed by Gerrit Code Review
Browse files

Merge "Ensure that the R8 minification map (ProGuard dictionary) file exists"

parents c247436e b2293438

core/definitions.mk

+2 −0
Original line number Diff line number Diff line
@@ -2914,12 +2914,14 @@ endef 
###########################################################

define transform-jar-to-dex-r8

@echo R8: $@

$(hide) rm -f $(PRIVATE_PROGUARD_DICTIONARY)

$(hide) $(R8_COMPAT_PROGUARD) -injars '$<' \

    --min-api $(PRIVATE_MIN_SDK_VERSION) \

    --force-proguard-compatibility --output $(subst classes.dex,,$@) \

    $(PRIVATE_PROGUARD_FLAGS) \

    $(addprefix -injars , $(PRIVATE_EXTRA_INPUT_JAR)) \

    $(PRIVATE_DX_FLAGS)

$(hide) touch $(PRIVATE_PROGUARD_DICTIONARY)

endef



###########################################################

core/java.mk

+1 −0
Original line number Diff line number Diff line
@@ -489,6 +489,7 @@ $(built_dex_intermediate): PRIVATE_DX_FLAGS := $(LOCAL_DX_FLAGS) 
ifdef LOCAL_PROGUARD_ENABLED

  $(built_dex_intermediate): PRIVATE_EXTRA_INPUT_JAR := $(extra_input_jar)

  $(built_dex_intermediate): PRIVATE_PROGUARD_FLAGS := $(legacy_proguard_flags) $(common_proguard_flags) $(LOCAL_PROGUARD_FLAGS)

  $(built_dex_intermediate): PRIVATE_PROGUARD_DICTIONARY := $(proguard_dictionary)

  $(built_dex_intermediate) : $(full_classes_pre_proguard_jar) $(extra_input_jar) $(my_proguard_sdk_raise) $(common_proguard_flag_files) $(proguard_flag_files) $(legacy_proguard_lib_deps) $(R8_COMPAT_PROGUARD)

	$(transform-jar-to-dex-r8)

else # !LOCAL_PROGUARD_ENABLED