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

2023-02-08 17:39:51 +00:00
parent a154b87205 d5d8904e52
commit 0a3f6a2bb5
1 changed files with 4 additions and 0 deletions
--- a/core/config.mk
+++ b/core/config.mk
@@ -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