commit 0a3f6a2bb5979a36f816de18aa9cd8655ac35136
author Jiakai Zhang <jiakaiz@google.com> Wed Feb 08 17:39:51 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 08 17:39:51 2023 +0000
tree 1eb8070bc0eebd07435297e6856390a5303581ce
parent a154b8720519ad0a9e18b1431675b1c504ea51e2
parent d5d8904e528191cb8867d29e66e7c4cd44becadf

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

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 025a3a1..d016501 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -502,6 +502,10 @@
   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