p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Prep D8 default instead of CompatDX in build/core 

Also use zip2zip to extract classes into another jar
to avoid hitting parameter limit in the shell invocations.

Bug: 69329508
Test: m checkbuild tests

Change-Id: Ic047aa699519b6b3fd100cb5395de945f96e4d0b
This commit is contained in:
Alan Leung 2017-12-13 00:11:40 -08:00
parent b379762089
commit c8ef37dfd8
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/definitions.mk
View File

@ -2415,15 +2415,16 @@ endef
define transform-classes-d8.jar-to-dex define transform-classes-d8.jar-to-dex
@echo "target Dex: $(PRIVATE_MODULE)" @echo "target Dex: $(PRIVATE_MODULE)"
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(hide) rm -rf $(dir $@)classes*.dex $(dir $@)*.class $(dir $@)d8_input $(hide) rm -f $(dir $@)classes*.dex $(dir $@)d8_input.jar
$(hide) unzip -qq -d $(dir $@)d8_input $< "*.class" $(hide) $(ZIP2ZIP) -j -i $< -o $(dir $@)d8_input.jar "**/*.class"
$(hide) $(DX_COMMAND) \ $(hide) $(DX_COMMAND) \
--output $(dir $@) \ --output $(dir $@) \
--min-api $(PRIVATE_MIN_SDK_VERSION) \ --min-api $(PRIVATE_MIN_SDK_VERSION) \
$(subst --main-dex-list=, --main-dex-list , \
$(subst --no-locals, --release, \ $(subst --no-locals, --release, \
$(filter-out --core-library --multi-dex,$(PRIVATE_DX_FLAGS))) \ $(filter-out --core-library --multi-dex --minimal-main-dex,$(PRIVATE_DX_FLAGS)))) \
$$(find $(dir $@)d8_input -name *.class | sort) $(dir $@)d8_input.jar
$(hide) rm -fr $(dir $@)d8_input $(hide) rm -f $(dir $@)d8_input.jar
endef endef
# Create a mostly-empty .jar file that we'll add to later. # Create a mostly-empty .jar file that we'll add to later.