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

Commit 4eee4745 authored by Alan Leung's avatar Alan Leung Committed by android-build-merger
Browse files

Merge "Rename r8 to r8-compat-proguard" 

am: 81eeb782

Change-Id: Ibe7c114115f627ae3f061f8087b93891af475e40
parents 1684afb6 81eeb782

core/config.mk

+1 −1
Original line number Diff line number Diff line
@@ -546,7 +546,7 @@ else # TARGET_BUILD_APPS || TARGET_BUILD_PDK 
  ZIPALIGN := $(prebuilt_sdk_tools_bin)/zipalign

endif # TARGET_BUILD_APPS || TARGET_BUILD_PDK



R8_COMPAT_PROGUARD_JAR := prebuilts/r8/compatproguard-master.jar

R8_COMPAT_PROGUARD := $(HOST_OUT_EXECUTABLES)/r8-compat-proguard



ifeq (,$(TARGET_BUILD_APPS))

  # Use RenderScript prebuilts for unbundled builds but not PDK builds

core/definitions.mk

+1 −1
Original line number Diff line number Diff line
@@ -2804,7 +2804,7 @@ endif 
###########################################################

define transform-jar-to-dex-r8

@echo R8: $@

$(hide) $(JAVA) -jar $(R8_COMPAT_PROGUARD_JAR) -injars '$<$(PRIVATE_PROGUARD_INJAR_FILTERS)' \

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

    --min-api $(PRIVATE_MIN_SDK_VERSION) \

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

    $(PRIVATE_PROGUARD_FLAGS) \

core/java.mk

+1 −1
Original line number Diff line number Diff line
@@ -765,7 +765,7 @@ my_r8 := true 
$(built_dex_intermediate): PRIVATE_PROGUARD_INJAR_FILTERS := $(proguard_injar_filters)

$(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) : $(full_classes_proguard_jar) $(extra_input_jar) $(my_support_library_sdk_raise) $(common_proguard_flag_files) $(proguard_flag_files) $(legacy_proguard_lib_deps) $(R8_COMPAT_PROGUARD_JAR)

$(built_dex_intermediate) : $(full_classes_proguard_jar) $(extra_input_jar) $(my_support_library_sdk_raise) $(common_proguard_flag_files) $(proguard_flag_files) $(legacy_proguard_lib_deps) $(R8_COMPAT_PROGUARD)

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

endif # USE_R8

endif # LOCAL_PROGUARD_ENABLED