commit 0aaa561255dc9e8cb32f47b60190538ab0ef895f
author Rob Seymour <rseymour@google.com> Wed May 24 15:03:05 2023 +0000
committer Rob Seymour <rseymour@google.com> Thu Jun 01 16:48:46 2023 +0000
tree 0db19edd718b646544f7edebbbbed65639ae87a5
parent 2c5fb95f32d9bb80dd44cb9b99b8966f846b5b89

Do not set DISABLE_PREOPT_BOOT_IMAGES when doing a VSDK build.

Bug: 283843071
Test: build vsdk based image
Change-Id: Id35196d266994fe222f55a0711b52938253d48a7

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 0e2d271..e65a906 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -549,7 +549,10 @@
 DISABLE_PREOPT_BOOT_IMAGES :=
 ifneq (,$(TARGET_BUILD_APPS)$(TARGET_BUILD_UNBUNDLED_IMAGE))
   DISABLE_PREOPT := true
-  DISABLE_PREOPT_BOOT_IMAGES := true
+  # VSDK builds perform dexpreopt during merge_target_files build step.
+  ifneq (true,$(BUILDING_WITH_VSDK))
+    DISABLE_PREOPT_BOOT_IMAGES := true
+  endif
 endif
 ifeq (true,$(TARGET_BUILD_UNBUNDLED))
   ifneq (true,$(UNBUNDLED_BUILD_SDKS_FROM_SOURCE))