Merge "Copy dexpreopt.config only if it exists" am: 5e5b52033c am: 66a74eb2cb

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

Change-Id: Ibae815bcb6a8a5d0d8298840c19eb6ec7038e9d2
This commit is contained in:
Treehugger Robot 2021-04-26 17:34:04 +00:00 committed by Automerger Merge Worker
commit e2421c5067
1 changed files with 4 additions and 0 deletions

View File

@ -5337,8 +5337,12 @@ $(DEXPREOPT_CONFIG_ZIP): $(FULL_SYSTEMIMAGE_DEPS) \
$(DEXPREOPT_CONFIG_ZIP): $(SOONG_ZIP)
$(hide) mkdir -p $(dir $@) $(PRODUCT_OUT)/dexpreopt_config
ifneq (,$(DEX_PREOPT_CONFIG_FOR_MAKE))
$(hide) cp $(DEX_PREOPT_CONFIG_FOR_MAKE) $(PRODUCT_OUT)/dexpreopt_config
endif
ifneq (,$(DEX_PREOPT_SOONG_CONFIG_FOR_MAKE))
$(hide) cp $(DEX_PREOPT_SOONG_CONFIG_FOR_MAKE) $(PRODUCT_OUT)/dexpreopt_config
endif
$(hide) $(SOONG_ZIP) -d -o $@ -C $(PRODUCT_OUT)/dexpreopt_config -D $(PRODUCT_OUT)/dexpreopt_config
# -----------------------------------------------------------------