StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support prebuilts for Go am: fa2b8b1567

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24151504

Change-Id: I4e0324f90fdc1ac3beb798ebfc3742785f6c768c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Paul Duffin
2023-07-25 08:59:53 +00:00
committed by Automerger Merge Worker
parent 1137fb1e50 fa2b8b1567
commit b0983e4f74
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/android_soong_config_vars.mk
View File

@@ -87,9 +87,9 @@ endif
ifneq (,$(MODULE_BUILD_FROM_SOURCE)) ifneq (,$(MODULE_BUILD_FROM_SOURCE))
# Keep an explicit setting. # 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 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, # 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. # and disable prebuilt SDKs. In particular this applies to AOSP builds.
# #