Merge "Revert "Drop cmdgoals special case from prebuilt selection"" into main am: 0da2fee848
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:
@@ -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)
|
||||
|
Reference in New Issue
Block a user