From fa2b8b15676945c993fa5abf5ff9088d829ac32f Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Fri, 21 Jul 2023 11:00:14 +0100 Subject: [PATCH] Support prebuilts for Go Previously, the build assumed that we only provided prebuilts for Android Big devices and would build from sources for all others. This change adds support for using prebuilts for Go. Ignore-AOSP-First: Needed as part of large topic to add go prebuilts to udc-dev Bug: 289303031 Test: m droid Change-Id: I59f7ba15b0437fd4cc622f3de2582d999fb13c0d --- core/android_soong_config_vars.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index 140acf0f16..6bac52b5ee 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -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. #