diff options
| author | Anton Hansson <hansson@google.com> | 2022-06-14 11:56:30 +0000 |
|---|---|---|
| committer | Anton Hansson <hansson@google.com> | 2022-06-14 13:43:37 +0000 |
| commit | ad0ef270db79cdf67508dff343d1f36cd58308eb (patch) | |
| tree | be387f7f4ae8d3f13443b97c01d67d24050880f6 | |
| parent | 99b87147ece96c9b214a976c657beff0acd0a568 (diff) | |
| download | build-ad0ef270db79cdf67508dff343d1f36cd58308eb.tar.gz | |
Don't exclude docs build from using prebuilts
Even though it doesn't have google modules in PRODUCT_PACKAGES,
the docs build wants to use prebuilts when the rest of the branch
does.
Bug: 230478310
Test: m docs (inspect MODULE_BUILD_FROM_SOURCE)
Change-Id: I1d67f4099e9fdc5fbaeeb0bf0fce80aa91c05eb5
| -rw-r--r-- | core/android_soong_config_vars.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index 28181ebfae..ae8204c8a2 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -93,13 +93,13 @@ endif ifneq (,$(MODULE_BUILD_FROM_SOURCE)) # Keep an explicit setting. -else ifeq (,$(filter 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))) # Prebuilt module SDKs require prebuilt modules to work, and currently # prebuilt modules are only provided for com.google.android.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. # - # However, sdk/win_sdk/sdk_addon builds might not include com.google.android.xxx + # However, docs/sdk/win_sdk/sdk_addon builds might not include com.google.android.xxx # packages, so for those we respect the default behavior. MODULE_BUILD_FROM_SOURCE := true else ifneq (,$(PRODUCT_MODULE_BUILD_FROM_SOURCE)) |