diff options
| author | Anton Hansson <hansson@google.com> | 2022-06-15 17:59:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-06-15 17:59:25 +0000 |
| commit | 29ae21ebb7d299e25fb4dc67deb73bbc560b7c5e (patch) | |
| tree | 74809f01fffe5fabf0f8c6c4805b6e4a7b8cc095 | |
| parent | 0e729cfc1dc0cfe077ddaf8b377c9a247b1bcf51 (diff) | |
| parent | ad0ef270db79cdf67508dff343d1f36cd58308eb (diff) | |
| download | build-29ae21ebb7d299e25fb4dc67deb73bbc560b7c5e.tar.gz | |
Merge "Don't exclude docs build from using prebuilts" into tm-dev
| -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 41310de9d4..711518ed70 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)) |