tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Also disable dexpreopt for boot images for unbundled builds." am: 081bad48eb am: 52d9e9bb7f am: 20e560fde3 am: 7c953e9ccb am: 439591bf42

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

Change-Id: I43b3f6f63ef6324a295a8466c4d91ef4b6ee2808
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-05-10 21:46:41 +00:00 committed by Automerger Merge Worker
commit 47410a60bd
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/config.mk
View file

@ -546,8 +546,10 @@ endif
TARGET_BUILD_USE_PREBUILT_SDKS :=
DISABLE_PREOPT :=
DISABLE_PREOPT_BOOT_IMAGES :=
ifneq (,$(TARGET_BUILD_APPS)$(TARGET_BUILD_UNBUNDLED_IMAGE))
DISABLE_PREOPT := true
DISABLE_PREOPT_BOOT_IMAGES := true
endif
ifeq (true,$(TARGET_BUILD_UNBUNDLED))
ifneq (true,$(UNBUNDLED_BUILD_SDKS_FROM_SOURCE))
@ -558,6 +560,7 @@ endif
.KATI_READONLY := \
TARGET_BUILD_USE_PREBUILT_SDKS \
DISABLE_PREOPT \
DISABLE_PREOPT_BOOT_IMAGES \
prebuilt_sdk_tools := prebuilts/sdk/tools
prebuilt_sdk_tools_bin := $(prebuilt_sdk_tools)/$(HOST_OS)/bin

12
core/dex_preopt_config.mk
View file

@ -12,9 +12,15 @@ else ifneq (true,$(filter true,$(PRODUCT_USES_DEFAULT_ART_CONFIG)))
# would result in passing bad arguments to dex2oat and failing the build.
ENABLE_PREOPT :=
ENABLE_PREOPT_BOOT_IMAGES :=
else ifeq (true,$(DISABLE_PREOPT))
# Disable dexpreopt for libraries/apps, but do compile boot images.
ENABLE_PREOPT :=
else
ifeq (true,$(DISABLE_PREOPT))
# Disable dexpreopt for libraries/apps, but may compile boot images.
ENABLE_PREOPT :=
endif
ifeq (true,$(DISABLE_PREOPT_BOOT_IMAGES))
# Disable dexpreopt for boot images, but may compile libraries/apps.
ENABLE_PREOPT_BOOT_IMAGES :=
endif
endif
# The default value for LOCAL_DEX_PREOPT