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

Commit 5852c935 authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge "Use flags from Soong for d8 and r8"

parents 1b9a0c8f 17ea3419

core/definitions.mk

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

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

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

$(hide) $(DX_COMMAND) \

$(hide) $(DX_COMMAND) $(DEX_FLAGS) \

    --output $(dir $@) \

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

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

@echo R8: $@

$(hide) rm -f $(PRIVATE_PROGUARD_DICTIONARY)

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

$(hide) $(R8_COMPAT_PROGUARD) $(DEX_FLAGS) \

    -injars '$<' \

    --min-api $(PRIVATE_MIN_SDK_VERSION) \

    --no-data-resources \

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