diff options
| author | Anton Hansson <hansson@google.com> | 2022-06-15 18:20:00 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-06-15 18:20:00 +0000 |
| commit | 215d338c3b0704e48697586fae7de5e432b66df7 (patch) | |
| tree | f54dce013d2fc0e43333967218759d5b134712b7 | |
| parent | 9a3fde9c2136d6e5f553d6639dee714dbf3cfb36 (diff) | |
| parent | 29ae21ebb7d299e25fb4dc67deb73bbc560b7c5e (diff) | |
| download | build-215d338c3b0704e48697586fae7de5e432b66df7.tar.gz | |
Merge "Don't exclude docs build from using prebuilts" into tm-dev am: 29ae21ebb7
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18886329
Change-Id: If4bdd99bdcdb4662d9e1af68a606f4ce2774bd94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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 361439ae18..259035e054 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -43,13 +43,13 @@ BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := true 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)) |