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

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

Merge "Don't disable dexpreopt for an unbundled build." am: 0a3f6a2b 

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



Change-Id: Ib352612a51574c623334cd670d7762125469fe90
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 72ff0b35 0a3f6a2b

core/config.mk

+4 −0
Original line number Original line Diff line number Diff line
@@ -502,6 +502,10 @@ ifneq (,$(TARGET_BUILD_APPS)$(TARGET_BUILD_UNBUNDLED_IMAGE)) 
  DISABLE_PREOPT := true

  DISABLE_PREOPT := true

endif

endif

ifeq (true,$(TARGET_BUILD_UNBUNDLED))

ifeq (true,$(TARGET_BUILD_UNBUNDLED))

  # Don't disable dexpreopt for an unbundled build. Dexpreopt generates profiles that need to be

  # installed in the APEX. Soong will skip the dex2oat step after it generates the build rule for

  # profiles.

  DISABLE_PREOPT :=

  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

  endif

  endif