Merge "Don't disable dexpreopt for an unbundled build."

This commit is contained in:
Jiakai Zhang
2023-02-08 17:39:51 +00:00
committed by Gerrit Code Review

View File

@@ -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