diff options
| author | Spandan Das <spandandas@google.com> | 2024-04-26 23:08:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-26 23:08:10 +0000 |
| commit | 4049cdb23a765a80dcef4bcc664444681809395a (patch) | |
| tree | af9459036e1323c9d9c9473507a8dbd43eaee74a | |
| parent | e18b9fee63c1ad00398b56b378e650bd073e67f6 (diff) | |
| download | build-4049cdb23a765a80dcef4bcc664444681809395a.tar.gz | |
Revert "Drop cmdgoals special case from prebuilt selection"
This reverts commit e18b9fee63c1ad00398b56b378e650bd073e67f6.
Reason for revert: Likely causing build failures for go/ab/git_aosp-main-with-phones
Change-Id: If01f58908bd66c7afa42b9c96d048dfcd2d70812
| -rw-r--r-- | core/android_soong_config_vars.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index d8a7b9dd7c..56da5741e7 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -50,6 +50,8 @@ endif ifneq (,$(MODULE_BUILD_FROM_SOURCE)) # Keep an explicit setting. +else ifeq (,$(filter docs sdk win_sdk sdk_addon,$(MAKECMDGOALS))) + MODULE_BUILD_FROM_SOURCE := true else ifneq (,$(PRODUCT_MODULE_BUILD_FROM_SOURCE)) # Let products override the branch default. MODULE_BUILD_FROM_SOURCE := $(PRODUCT_MODULE_BUILD_FROM_SOURCE) |