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

Commit 9a5e3d53 authored by Paul Duffin's avatar Paul Duffin Committed by Cherrypicker Worker
Browse files

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 4f4b6d77)
Merged-In: Iea0ad09182a162b8f5ddf1403f65a3bbffb9ef08
parent 52a97270

core/android_soong_config_vars.mk

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