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

Commit 1410f684 authored by Jared Duke's avatar Jared Duke
Browse files

Use the new R8/D8_FLAGS vars 

Propagate the new D8/R8 JVM flags vars that were formerly combined in
DEX_FLAGS.

Bug: 205303544
Test: time m
Change-Id: Ifc6051cd9422b3f5c52322833d9a7f5e8263f857
parent 71585eae

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) $(DEX_FLAGS) \

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

    --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) $(DEX_FLAGS) \

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

    -injars '$<' \

    --min-api $(PRIVATE_MIN_SDK_VERSION) \

    --no-data-resources \