Merge "Drop cmdgoals special case from prebuilt selection" into main am: 8e7c645476

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

Change-Id: I4482f8bca3a270a1a7145be91e27904c95f4a690
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-04-26 23:14:35 +00:00
committed by Automerger Merge Worker

View File

@@ -50,8 +50,6 @@ 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)