From 0aaa561255dc9e8cb32f47b60190538ab0ef895f Mon Sep 17 00:00:00 2001
From: Rob Seymour <rseymour@google.com>
Date: Wed, 24 May 2023 15:03:05 +0000
Subject: [PATCH] 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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/config.mk b/core/config.mk
index 0e2d2719f5..e65a906427 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -549,7 +549,10 @@ DISABLE_PREOPT :=
 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))