commit 0da2fee848d70377a70494a4f7c86e0103c88ebd
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Sat Apr 27 00:23:56 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Apr 27 00:23:56 2024 +0000
tree a07b529ef4d0ce0d37d2751d4da6fa15c0822060
parent 3e2f5a0df87839184d6155e20711621597181abc
parent 4049cdb23a765a80dcef4bcc664444681809395a

Merge "Revert "Drop cmdgoals special case from prebuilt selection"" into main

core/android_soong_config_vars.mk

diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index d8a7b9d..56da574 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -50,6 +50,8 @@
 
 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)