| commit | 10ea9a933549a8e3aca3b7a34f418aabfb53b80a | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri Apr 26 23:32:43 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 26 23:32:43 2024 +0000 |
| tree | 66dcf7f384bce9c0d900cd4c58d7589ef2dc1f04 | |
| parent | 9e94cd3d456b2c07a9d09ac2c8b76edc61cf4496 [diff] | |
| parent | 151043cc08850dc14ce6380dbb92aba950ae97cb [diff] |
Merge "Drop cmdgoals special case from prebuilt selection" into main am: 8e7c645476 am: 151043cc08 Original change: https://android-review.googlesource.com/c/platform/build/+/3063044 Change-Id: If4a06898e394a4cbfa0c93d42863863ecacd447b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index 1d028fa..6c9308a 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk
@@ -50,8 +50,6 @@ 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)