diff options
| author | Paul Duffin <paulduffin@google.com> | 2022-06-09 15:59:28 +0000 |
|---|---|---|
| committer | Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | 2022-06-11 12:17:02 +0000 |
| commit | 9a5e3d53a8b9bd40917fa7ab28eab80753a62c1f (patch) | |
| tree | 7c4c073eaf69a72c7b65f0d57e2c287419961466 | |
| parent | 52a972709d4f2525255f611cf8b24e7cd0fa1e30 (diff) | |
| download | build-9a5e3d53a8b9bd40917fa7ab28eab80753a62c1f.tar.gz | |
Add wifi_module/source_build Soong config variable
As an optional module, wifi has its own Soong config variable. This
change ensures that it is controlled by the same environment variable
as the rest of the modules.
Bug: 233965247
Test: # Unpack wifi snapshot that uses wifi specific Soong config.
m nothing
# Without this the build fails as it uses the wifi prebuilts
# which do not work in AOSP.
# With this change the build passes as it uses the wifi
# sources.
Change-Id: Iea0ad09182a162b8f5ddf1403f65a3bbffb9ef08
(cherry picked from commit 4f4b6d776df71655c8d7723f5c0c67c75c0c6a0e)
Merged-In: Iea0ad09182a162b8f5ddf1403f65a3bbffb9ef08
| -rw-r--r-- | core/android_soong_config_vars.mk | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index 28181ebfae..5b49749b35 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -121,6 +121,15 @@ endif $(call soong_config_set,art_module,source_build,$(ART_MODULE_BUILD_FROM_SOURCE)) +# Ensure that those mainline modules who have individually toggleable prebuilts +# are controlled by the MODULE_BUILD_FROM_SOURCE environment variable by +# default. +INDIVIDUALLY_TOGGLEABLE_PREBUILT_MODULES := \ + wifi \ + +$(foreach m, $(INDIVIDUALLY_TOGGLEABLE_PREBUILT_MODULES),\ + $(call soong_config_set,$(m)_module,source_build,$(MODULE_BUILD_FROM_SOURCE))) + # Apex build mode variables ifdef APEX_BUILD_FOR_PRE_S_DEVICES $(call add_soong_config_var_value,ANDROID,library_linking_strategy,prefer_static) |