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.

Bug: 241823638
Test: -
  1. Patch ag/20581649 PS2.
  2. banchan com.android.btservices x86_64 && m
  3. Check that "javalib/service-bluetooth.jar.prof" exists in the APEX.
Change-Id: I5cad1b0e1027935fd78e80ad7b07e039f7b8d432
This commit is contained in:
Jiakai Zhang
2023-02-08 02:34:51 +08:00
parent a315389d19
commit d5d8904e52

View File

@@ -502,6 +502,10 @@ ifneq (,$(TARGET_BUILD_APPS)$(TARGET_BUILD_UNBUNDLED_IMAGE))
DISABLE_PREOPT := true
endif
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))
TARGET_BUILD_USE_PREBUILT_SDKS := true
endif