Merge "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." am: 33790fc855
am: 3f20c0264c
Original change: https://android-review.googlesource.com/c/platform/build/+/2362614 Change-Id: Iccb497863e0b6c6a8d8927fb828dac0ad303edc3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -25,3 +25,8 @@ PRODUCT_SHIPPING_API_LEVEL := 29
|
|||||||
# Builds using a module product should build modules from source, even if
|
# Builds using a module product should build modules from source, even if
|
||||||
# BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE says otherwise.
|
# BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE says otherwise.
|
||||||
PRODUCT_MODULE_BUILD_FROM_SOURCE := true
|
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
|
||||||
|
Reference in New Issue
Block a user