commit 11f44e2802a3f6c6ad43458b5541f9951c7f7171
author Jiakai Zhang <jiakaiz@google.com> Mon Mar 28 20:36:47 2022 +0100
committer Jiakai Zhang <jiakaiz@google.com> Tue Mar 29 16:11:12 2022 +0100
tree 9ba7d69e4e7b14d238f330dc39465b1ccb5d0838
parent ce8629fdbf01a3af7d498e2891d08eeb1e272eb0

Always turn on TARGET_BUILD_USE_PREBUILT_SDKS for unbundled build.

Before this change, TARGET_BUILD_USE_PREBUILT_SDKS was turned on only if
TARGET_BUILD_APPS or TARGET_BUILD_UNBUNDLED_IMAGE is set. After this
change, TARGET_BUILD_USE_PREBUILT_SDKS is always turned on if
TARGET_BUILD_UNBUNDLED is set.

We need this change because we need to build ART services on the thin
manifest, and ART's build script only sets TARGET_BUILD_UNBUNDLED.

Bug: 177273468
Test: (on aosp-master-art) . ./build/envsetup.sh && lunch arm_krait-eng && art/tools/buildbot-build.sh --target
Change-Id: I1b5f63043d518ac8306bd172ef8afd69ab3ae8e5

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 5ef9211..f971c51 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -494,7 +494,9 @@
 DISABLE_PREOPT :=
 ifneq (,$(TARGET_BUILD_APPS)$(TARGET_BUILD_UNBUNDLED_IMAGE))
   DISABLE_PREOPT := true
-  ifndef UNBUNDLED_BUILD_SDKS_FROM_SOURCE
+endif
+ifeq (true,$(TARGET_BUILD_UNBUNDLED))
+  ifneq (true,$(UNBUNDLED_BUILD_SDKS_FROM_SOURCE))
     TARGET_BUILD_USE_PREBUILT_SDKS := true
   endif
 endif