Merge "Do not override setting of SOONG_CONFIG_<m>_module_source_build" am: dc08c346fb

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

Change-Id: Iee2175269983ebcb124f7fe242d699ca2dd3e7a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-06-24 19:12:35 +00:00
committed by Automerger Merge Worker

View File

@@ -78,7 +78,8 @@ INDIVIDUALLY_TOGGLEABLE_PREBUILT_MODULES := \
wifi \
$(foreach m, $(INDIVIDUALLY_TOGGLEABLE_PREBUILT_MODULES),\
$(call soong_config_set,$(m)_module,source_build,$(MODULE_BUILD_FROM_SOURCE)))
$(if $(call soong_config_get,$(m)_module,source_build),,\
$(call soong_config_set,$(m)_module,source_build,$(MODULE_BUILD_FROM_SOURCE))))
# Apex build mode variables
ifdef APEX_BUILD_FOR_PRE_S_DEVICES