aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2024-04-27 00:23:56 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-04-27 00:23:56 +0000
commit0da2fee848d70377a70494a4f7c86e0103c88ebd (patch)
treea07b529ef4d0ce0d37d2751d4da6fa15c0822060
parent3e2f5a0df87839184d6155e20711621597181abc (diff)
parent4049cdb23a765a80dcef4bcc664444681809395a (diff)
downloadbuild-master.tar.gz
Merge "Revert "Drop cmdgoals special case from prebuilt selection"" into mainHEADmastermain
-rw-r--r--core/android_soong_config_vars.mk2
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)