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

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

Merge "Don't make dexpreopt_tools.zip when dex2oat isn't avilable" am: bf5d6238 am: e9b9f7f0 

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

Change-Id: Id7de61da766da6e0a6ee39e3ee54d0ca902de25f
parents 51e07f62 e9b9f7f0

core/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -5321,6 +5321,7 @@ $(APPCOMPAT_ZIP): $(SOONG_ZIP) 


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

ifeq ($(BUILD_OS),linux)

ifneq ($(DEX2OAT),)

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

DEXPREOPT_TOOLS_ZIP := $(PRODUCT_OUT)/dexpreopt_tools.zip

$(DEXPREOPT_TOOLS_ZIP): $(dexpreopt_tools_deps)
@@ -5328,7 +5329,8 @@ $(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

endif # DEX2OAT is set

endif # BUILD_OS == linux



DEXPREOPT_CONFIG_ZIP := $(PRODUCT_OUT)/dexpreopt_config.zip

$(DEXPREOPT_CONFIG_ZIP): $(FULL_SYSTEMIMAGE_DEPS) \