commit b26bf58e1297329499c6dcd23a097c93027fded5
author Jeongik Cha <jeongik@google.com> Tue Jun 08 11:31:31 2021 +0900
committer Jeongik Cha <jeongik@google.com> Wed Jul 14 18:52:01 2021 +0900
tree 153bd89ff43a290b718a11dc11b983963e52b73a
parent 663d0ffddef2d8b92048e02b93a9c92a2e319a2d

dexpreopt.config should be created even though unbundled image is built

Bug: 188179858
Test: compare dexpreopt_config.zip files from
 1. TARGET_BUILD_UNBUNDLED_IMAGE=true m dexpreopt_config_zip
 2. m dexpreopt_config_zip
(note that m clean should run between steps)

Change-Id: I92623b59e4fcac397c7fed3d7ab1070fe5281027

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 70c7dd2..21f4387 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1737,7 +1737,6 @@
   $(call dist-for-goals, droidcore, \
     $(BUILT_OTATOOLS_PACKAGE) \
     $(APPCOMPAT_ZIP) \
-    $(DEXPREOPT_CONFIG_ZIP) \
     $(DEXPREOPT_TOOLS_ZIP) \
   )
 
@@ -1785,6 +1784,7 @@
     $(INSTALLED_ANDROID_INFO_TXT_TARGET) \
     $(INSTALLED_MISC_INFO_TARGET) \
     $(INSTALLED_RAMDISK_TARGET) \
+    $(DEXPREOPT_CONFIG_ZIP) \
   )
 
   # Put a copy of the radio/bootloader files in the dist dir.