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

Do not override setting of SOONG_CONFIG_<m>_module_source_build

Browse Source 
Previously, any setting of SOONG_CONFIG_<m>_module_source_build (where
<m> is one of wifi, uwb or bluetooth) that was made before the
core/android_soong_config_vars.mk was processed would be replaced with
false. This change will only set them to false if they have not been
previously set.

Bug: 233965247
Test: m nothing
      # After setting SOONG_CONFIG_wifi_module_source=true before this
      # code. Without this change out/soong/soong.variables uses false
      # for the wifi_module/module_source config variable. With this
      # change it uses true.
Change-Id: I1dffeb055a68250f574630d4ef5fedc51bad4a2b
This commit is contained in:
Paul Duffin
2022-06-22 16:42:26 +00:00
parent 9c2f61119c
commit dccd189954
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/android_soong_config_vars.mk
View File

@@ -130,7 +130,8 @@ INDIVIDUALLY_TOGGLEABLE_PREBUILT_MODULES := \
wifi \ wifi \
$(foreach m, $(INDIVIDUALLY_TOGGLEABLE_PREBUILT_MODULES),\ $(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 # Apex build mode variables
ifdef APEX_BUILD_FOR_PRE_S_DEVICES ifdef APEX_BUILD_FOR_PRE_S_DEVICES