StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ic59240df79e86169a48363a545301f11416a18f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-04-27 00:44:33 +00:00
committed by Automerger Merge Worker
parent a4fe929837 0da2fee848
commit e5748d79d5
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/android_soong_config_vars.mk
View File

@@ -50,6 +50,8 @@ endif
ifneq (,$(MODULE_BUILD_FROM_SOURCE)) ifneq (,$(MODULE_BUILD_FROM_SOURCE))
# Keep an explicit setting. # 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)) else ifneq (,$(PRODUCT_MODULE_BUILD_FROM_SOURCE))
# Let products override the branch default. # Let products override the branch default.
MODULE_BUILD_FROM_SOURCE := $(PRODUCT_MODULE_BUILD_FROM_SOURCE) MODULE_BUILD_FROM_SOURCE := $(PRODUCT_MODULE_BUILD_FROM_SOURCE)