Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e16a704a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Drop cmdgoals special case from prebuilt selection"" into main... 

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

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



Change-Id: I1abe74e827fb8dd69ef8fe88d06441068b716b33
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 28b224fc e5748d79

core/android_soong_config_vars.mk

+2 −0
Original line number Diff line number Diff line
@@ -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)