Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97f21846 authored by Paul Duffin's avatar Paul Duffin Committed by Automerger Merge Worker
Browse files

Support prebuilts for Go am: fa2b8b15 am: 605819e1 am: 095b1ad5 

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



Change-Id: Icf8d9e011eeca47649fb7715e69bcc257cfc7bbb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e50a7f34 095b1ad5

core/android_soong_config_vars.mk

+2 −2
Original line number Diff line number Diff line
@@ -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.

  #