Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9712a69 authored by Jiakai Zhang's avatar Jiakai Zhang Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I47e1203b3c1601e99713a8da245c8f40d7c752c8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e303c3ec 81cd7533

core/config.mk

+3 −0
Original line number Diff line number Diff line
@@ -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

core/dex_preopt_config.mk

+9 −3
Original line number Diff line number Diff line
@@ -12,10 +12,16 @@ 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.

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

DEX_PREOPT_DEFAULT ?= $(ENABLE_PREOPT)