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

Commit b27140da authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Replace DEX_FLAGS by flags for D8 and R8."

parents 4faef387 8deeb2b6

core/definitions.mk

+2 −2
Original line number Diff line number Diff line
@@ -2609,7 +2609,7 @@ define transform-classes.jar-to-dex 
@mkdir -p $(dir $@)tmp

$(hide) rm -f $(dir $@)classes*.dex $(dir $@)d8_input.jar

$(hide) $(ZIP2ZIP) -j -i $< -o $(dir $@)d8_input.jar "**/*.class"

$(hide) $(D8_WRAPPER) $(DX_COMMAND) $(D8_FLAGS) \

$(hide) $(D8_WRAPPER) $(D8_COMMAND) \

    --output $(dir $@)tmp \

    $(addprefix --lib ,$(PRIVATE_D8_LIBS)) \

    --min-api $(PRIVATE_MIN_SDK_VERSION) \
@@ -3213,7 +3213,7 @@ endif 
define transform-jar-to-dex-r8

@echo R8: $@

$(hide) rm -f $(PRIVATE_PROGUARD_DICTIONARY)

$(hide) $(R8_WRAPPER) $(R8_COMPAT_PROGUARD) $(R8_FLAGS) \

$(hide) $(R8_WRAPPER) $(R8_COMMAND) \

    -injars '$<' \

    --min-api $(PRIVATE_MIN_SDK_VERSION) \

    --no-data-resources \

core/java.mk

+2 −2
Original line number Diff line number Diff line
@@ -494,13 +494,13 @@ 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) $(legacy_proguard_lib_deps) $(R8_COMPAT_PROGUARD) $(LOCAL_PROGUARD_FLAGS_DEPS)

  $(built_dex_intermediate) : $(full_classes_pre_proguard_jar) $(extra_input_jar) $(my_proguard_sdk_raise) $(common_proguard_flag_files) $(legacy_proguard_lib_deps) $(R8) $(LOCAL_PROGUARD_FLAGS_DEPS)

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

else # !LOCAL_PROGUARD_ENABLED

  $(built_dex_intermediate): .KATI_NINJA_POOL := $(D8_NINJA_POOL)

  $(built_dex_intermediate): PRIVATE_D8_LIBS := $(full_java_bootclasspath_libs) $(full_shared_java_header_libs)

  $(built_dex_intermediate): $(full_java_bootclasspath_libs) $(full_shared_java_header_libs)

  $(built_dex_intermediate): $(full_classes_pre_proguard_jar) $(DX) $(ZIP2ZIP)

  $(built_dex_intermediate): $(full_classes_pre_proguard_jar) $(D8) $(ZIP2ZIP)

	$(transform-classes.jar-to-dex)

endif