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

Also disable dexpreopt for boot images for unbundled builds. am: 81cd7533c9

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

Change-Id: I8b00f5252afc9b774cae97333a99b7ae8ad2305d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jiakai Zhang
2023-05-11 09:53:28 +00:00
committed by Automerger Merge Worker
parent ad81226582 81cd7533c9
commit ad1378ab75
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/config.mk
View File

@@ -545,8 +545,10 @@ endif
TARGET_BUILD_USE_PREBUILT_SDKS := TARGET_BUILD_USE_PREBUILT_SDKS :=
DISABLE_PREOPT := DISABLE_PREOPT :=
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
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))
@@ -557,6 +559,7 @@ endif
.KATI_READONLY := \ .KATI_READONLY := \
TARGET_BUILD_USE_PREBUILT_SDKS \ TARGET_BUILD_USE_PREBUILT_SDKS \
DISABLE_PREOPT \ DISABLE_PREOPT \
DISABLE_PREOPT_BOOT_IMAGES \
prebuilt_sdk_tools := prebuilts/sdk/tools prebuilt_sdk_tools := prebuilts/sdk/tools
prebuilt_sdk_tools_bin := $(prebuilt_sdk_tools)/$(HOST_OS)/bin 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. # would result in passing bad arguments to dex2oat and failing the build.
ENABLE_PREOPT := ENABLE_PREOPT :=
ENABLE_PREOPT_BOOT_IMAGES := ENABLE_PREOPT_BOOT_IMAGES :=
else ifeq (true,$(DISABLE_PREOPT)) else
# Disable dexpreopt for libraries/apps, but do compile boot images. ifeq (true,$(DISABLE_PREOPT))
ENABLE_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 endif
# The default value for LOCAL_DEX_PREOPT # The default value for LOCAL_DEX_PREOPT