commit e16a704ab20869f99035a5c6cd26543b2cc327f7
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Sat Apr 27 01:02:29 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Apr 27 01:02:29 2024 +0000
tree 95cfea0831bad1d3243c6fd904307d7e33efc6e4
parent 28b224fc9a06e7af7291ef8383271604055fca44
parent e5748d79d576d050ff381064aa366e7fc634bdb0

Merge "Revert "Drop cmdgoals special case from prebuilt selection"" into main am: 0da2fee848 am: e5748d79d5

Original change: https://android-review.googlesource.com/c/platform/build/+/3063046

Change-Id: I1abe74e827fb8dd69ef8fe88d06441068b716b33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/android_soong_config_vars.mk

diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index 6c9308a..1d028fa 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)