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

Commit 62519def authored by Jeongik Cha's avatar Jeongik Cha
Browse files

Don't make dexpreopt_tools.zip when dex2oat isn't avilable 

Test: m
Bug: 158843648
Change-Id: Iae90ea60fc73f1a6202499528277fce7c950d9d3
parent 2522c36b

core/Makefile

+3 −1
Original line number Original line 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.

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

ifeq ($(BUILD_OS),linux)

ifeq ($(BUILD_OS),linux)

ifneq ($(DEX2OAT),)

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

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

DEXPREOPT_TOOLS_ZIP := $(PRODUCT_OUT)/dexpreopt_tools.zip

DEXPREOPT_TOOLS_ZIP := $(PRODUCT_OUT)/dexpreopt_tools.zip

$(DEXPREOPT_TOOLS_ZIP): $(dexpreopt_tools_deps)

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

$(DEXPREOPT_TOOLS_ZIP): $(SOONG_ZIP)

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

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

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

	$(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 := $(PRODUCT_OUT)/dexpreopt_config.zip

$(DEXPREOPT_CONFIG_ZIP): $(FULL_SYSTEMIMAGE_DEPS) \

$(DEXPREOPT_CONFIG_ZIP): $(FULL_SYSTEMIMAGE_DEPS) \