Support prebuilts for Go am: fa2b8b1567
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24151504 Change-Id: Ife9a700a290369da5d44a16cd5fc0431596a03ff Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -87,9 +87,9 @@ endif
|
||||
|
||||
ifneq (,$(MODULE_BUILD_FROM_SOURCE))
|
||||
# Keep an explicit setting.
|
||||
else ifeq (,$(filter docs sdk win_sdk sdk_addon,$(MAKECMDGOALS))$(findstring com.google.android.conscrypt,$(PRODUCT_PACKAGES)))
|
||||
else ifeq (,$(filter docs sdk win_sdk sdk_addon,$(MAKECMDGOALS))$(findstring com.google.android.conscrypt,$(PRODUCT_PACKAGES))$(findstring com.google.android.go.conscrypt,$(PRODUCT_PACKAGES)))
|
||||
# Prebuilt module SDKs require prebuilt modules to work, and currently
|
||||
# prebuilt modules are only provided for com.google.android.xxx. If we can't
|
||||
# prebuilt modules are only provided for com.google.android(.go)?.xxx. If we can't
|
||||
# find one of them in PRODUCT_PACKAGES then assume com.android.xxx are in use,
|
||||
# and disable prebuilt SDKs. In particular this applies to AOSP builds.
|
||||
#
|
||||
|
Reference in New Issue
Block a user