diff options
| -rw-r--r-- | core/config.mk | 3 | ||||
| -rw-r--r-- | core/dex_preopt_config.mk | 12 |
2 files changed, 12 insertions, 3 deletions
diff --git a/core/config.mk b/core/config.mk index fb162f00ca..0c086ee090 100644 --- a/core/config.mk +++ b/core/config.mk @@ -545,8 +545,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)) @@ -557,6 +559,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 diff --git a/core/dex_preopt_config.mk b/core/dex_preopt_config.mk index e36e2ebb6f..7b9c4dbac0 100644 --- a/core/dex_preopt_config.mk +++ b/core/dex_preopt_config.mk @@ -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 |