Merge "Do not set DISABLE_PREOPT_BOOT_IMAGES when doing a VSDK build."

2023-06-02 19:27:09 +00:00
parent 3b0ca61d36 0aaa561255
commit 7edc734ec1
1 changed files with 4 additions and 1 deletions
--- a/core/config.mk
+++ b/core/config.mk
@@ -549,8 +549,11 @@ DISABLE_PREOPT :=
 DISABLE_PREOPT_BOOT_IMAGES :=
 ifneq (,$(TARGET_BUILD_APPS)$(TARGET_BUILD_UNBUNDLED_IMAGE))
  DISABLE_PREOPT := 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))
    TARGET_BUILD_USE_PREBUILT_SDKS := true