aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKun Niu <kunniu@google.com>2022-12-16 10:17:37 -0800
committerCherrypicker Worker <android-build-cherrypicker-worker@google.com>2023-01-26 15:40:45 +0000
commitff6bc088a517b9bb4d57be27268c5d34db43ae86 (patch)
treeddae5e36a9949574f67f373616baea7f70df532f
parentcb51324568bae548657d5dbee654df0df24d2982 (diff)
downloadbuild-ff6bc088a517b9bb4d57be27268c5d34db43ae86.tar.gz
Set UNBUNDLED_BUILD_SDKS_FROM_SOURCE to true by default in
module_common.mk if the branch is not using slim manifests. This makes sure that mainline modules build locally are using the build from source sdk. Bug: 262783668 Test: time m atest && time atest-dev CtsNetTestCasesLatestSdk[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex] --verbose Change-Id: I37b94448a45b0b811ae1815ad8c46589c62e8542 (cherry picked from commit 40e6f9bdcabc6336657a1735cb036e9bfdefd45d) Merged-In: I37b94448a45b0b811ae1815ad8c46589c62e8542
-rw-r--r--target/product/module_common.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/target/product/module_common.mk b/target/product/module_common.mk
index 54f3949965..ec670ee4c9 100644
--- a/target/product/module_common.mk
+++ b/target/product/module_common.mk
@@ -25,3 +25,8 @@ PRODUCT_SHIPPING_API_LEVEL := 29
# Builds using a module product should build modules from source, even if
# BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE says otherwise.
PRODUCT_MODULE_BUILD_FROM_SOURCE := true
+
+# Build sdk from source if the branch is not using slim manifests.
+ifneq (,$(strip $(wildcard frameworks/base/Android.bp)))
+ UNBUNDLED_BUILD_SDKS_FROM_SOURCE := true
+endif