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

Commit d06f165a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Target for tools to dexpreopt" am: 26bad544 am: ee88da65 am: 4beb4442 am: fdca5d9f 

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

Change-Id: Id1c58d33761889994aa93ab9d534074b35a97ce5
parents 908717c6 fdca5d9f

core/Makefile

+11 −0
Original line number Diff line number Diff line
@@ -5319,6 +5319,17 @@ $(APPCOMPAT_ZIP): $(SOONG_ZIP) 
	$(hide) find $(PRODUCT_OUT)/appcompat | sort >$(PRIVATE_LIST_FILE)

	$(hide) $(SOONG_ZIP) -d -o $@ -C $(PRODUCT_OUT)/appcompat -l $(PRIVATE_LIST_FILE)



# The mac build doesn't build dex2oat, so create the zip file only if the build OS is linux.

ifeq ($(BUILD_OS),linux)

dexpreopt_tools_deps := $(DEXPREOPT_GEN_DEPS) $(DEXPREOPT_GEN) $(AAPT2)

DEXPREOPT_TOOLS_ZIP := $(PRODUCT_OUT)/dexpreopt_tools.zip

$(DEXPREOPT_TOOLS_ZIP): $(dexpreopt_tools_deps)

$(DEXPREOPT_TOOLS_ZIP): PRIVATE_DEXPREOPT_TOOLS_DEPS := $(dexpreopt_tools_deps)

$(DEXPREOPT_TOOLS_ZIP): $(SOONG_ZIP)

	$(hide) mkdir -p $(dir $@)

	$(hide) $(SOONG_ZIP) -d -o $@ -j $(addprefix -f ,$(PRIVATE_DEXPREOPT_TOOLS_DEPS)) -f $$(realpath $(DEX2OAT))

endif



DEXPREOPT_CONFIG_ZIP := $(PRODUCT_OUT)/dexpreopt_config.zip

$(DEXPREOPT_CONFIG_ZIP): $(FULL_SYSTEMIMAGE_DEPS) \

	    $(INTERNAL_RAMDISK_FILES) \

core/main.mk

+1 −0
Original line number Diff line number Diff line
@@ -1711,6 +1711,7 @@ else ifeq (,$(TARGET_BUILD_UNBUNDLED)) 
    $(COVERAGE_ZIP) \

    $(APPCOMPAT_ZIP) \

    $(DEXPREOPT_CONFIG_ZIP) \

    $(DEXPREOPT_TOOLS_ZIP) \

    $(INSTALLED_FILES_FILE) \

    $(INSTALLED_FILES_JSON) \

    $(INSTALLED_FILES_FILE_VENDOR) \