StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not set DISABLE_PREOPT_BOOT_IMAGES when doing a VSDK build." am: 7edc734ec1 am: 7844748642

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2602665

Change-Id: I6ca13e4e219730e7eb1c87a4cd95eb797c695abb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Rob Seymour
2023-06-02 21:13:28 +00:00
committed by Automerger Merge Worker
parent 1b0d706359 7844748642
commit 17f2908951
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/config.mk
View File

@@ -549,7 +549,10 @@ DISABLE_PREOPT :=
DISABLE_PREOPT_BOOT_IMAGES := DISABLE_PREOPT_BOOT_IMAGES :=
ifneq (,$(TARGET_BUILD_APPS)$(TARGET_BUILD_UNBUNDLED_IMAGE)) ifneq (,$(TARGET_BUILD_APPS)$(TARGET_BUILD_UNBUNDLED_IMAGE))
DISABLE_PREOPT := true 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 endif
ifeq (true,$(TARGET_BUILD_UNBUNDLED)) ifeq (true,$(TARGET_BUILD_UNBUNDLED))
ifneq (true,$(UNBUNDLED_BUILD_SDKS_FROM_SOURCE)) ifneq (true,$(UNBUNDLED_BUILD_SDKS_FROM_SOURCE))