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

Commit a3933f76 authored by Ramy Medhat's avatar Ramy Medhat Committed by Automerger Merge Worker
Browse files

[DO NOT MERGE] Modify D8 template to not have inputs under the output directory. am: 0ba998c3

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12468476

Change-Id: I7f218170ca51b9d7e40394cb5a91e31ea0ab26d9
parents fc82cb6c 0ba998c3
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -2244,17 +2244,19 @@ endef

define transform-classes.jar-to-dex
@echo "target Dex: $(PRIVATE_MODULE)"
@mkdir -p $(dir $@)
@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) \
    --output $(dir $@) \
    --output $(dir $@)tmp \
    $(addprefix --lib ,$(PRIVATE_D8_LIBS)) \
    --min-api $(PRIVATE_MIN_SDK_VERSION) \
    $(subst --main-dex-list=, --main-dex-list , \
        $(filter-out --core-library --multi-dex --minimal-main-dex,$(PRIVATE_DX_FLAGS))) \
    $(dir $@)d8_input.jar
$(hide) mv $(dir $@)tmp/* $(dir $@)
$(hide) rm -f $(dir $@)d8_input.jar
$(hide) rm -rf $(dir $@)tmp
endef

#TODO: we kinda want to build different asset packages for