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."

Browse Source
This commit is contained in:
Rob Seymour
2023-06-02 19:27:09 +00:00
committed by Gerrit Code Review
parent 3b0ca61d36 0aaa561255
commit 7edc734ec1
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/config.mk
View File

@@ -549,8 +549,11 @@ 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
# VSDK builds perform dexpreopt during merge_target_files build step.
ifneq (true,$(BUILDING_WITH_VSDK))
DISABLE_PREOPT_BOOT_IMAGES := true 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))
TARGET_BUILD_USE_PREBUILT_SDKS := true TARGET_BUILD_USE_PREBUILT_SDKS := true