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

Merge "Don't disable dexpreopt for an unbundled build." am: 0a3f6a2bb5 am: 8f1a701b8f

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

Change-Id: Idc4159e23bff8d1f3806aa293b26bd0334198bc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jiakai Zhang
2023-02-08 18:47:05 +00:00
committed by Automerger Merge Worker
parent 65fe3acb58 8f1a701b8f
commit cb3836fe52
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/config.mk
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