commit 35bf6b02198b2b98899eb09ba2baba82a1459ba6
author Jeongik Cha <jeongik@google.com> Fri Apr 23 19:09:04 2021 +0900
committer Jeongik Cha <jeongik@google.com> Fri Apr 23 20:15:26 2021 +0900
tree 4da322ecd57d33aaa66ccffc1430f8e59357268e
parent 6edaa353b107d3e16c362fb19cc46f70a878ff3e

Copy dexpreopt.config only if it exists

Bug: 158843648
Test: m dist when global dexpreopt.config doesn't exist
Change-Id: Iaa8ec04624e16cecceed3f2065945a180a867b1c

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index cf24ba0..40866ec 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -5337,8 +5337,12 @@
 
 $(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
 
 # -----------------------------------------------------------------