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

Commit 8ec0862b authored by Spandan Das's avatar Spandan Das
Browse files

Drop INDIVIDUALLY_TOGGLEABLE_PREBUILT_MODULES 

This list is used to create soong config namespaces per toggle-able
module, and set source_build property. internal and partner branches now
use RELEASE_APEX_CONTRIBUTIONS_* for source vs selection, so remove this
mechanism to prevent confusing behaviors when these two mechanisms have
conflicting values.

`art_module.source_build` is a special-case which uses an additional variable
`ART_MODULE_SOURCE_BUILD`. This will be tracked in
https://r.android.com/3037396

Bug: 308188056
Test: presubmits
Test: downloaded this CL in v-aml branch, m
out/soong/prebuilt_info.json; file is identical

Merged-In: I3f9cbb24d6f3a7a0312683906826708147f469ee
Change-Id: I3f9cbb24d6f3a7a0312683906826708147f469ee
parent b24b46d4

core/android_soong_config_vars.mk

+0 −28
Original line number Diff line number Diff line
@@ -74,34 +74,6 @@ ifdef TARGET_BOARD_AUTO 
  $(call add_soong_config_var_value, ANDROID, target_board_auto, $(TARGET_BOARD_AUTO))

endif



# 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 := \

  adservices \

  appsearch \

  btservices \

  devicelock \

  configinfrastructure \

  conscrypt \

  healthfitness \

  ipsec \

  media \

  mediaprovider \

  ondevicepersonalization \

  permission \

  rkpd \

  scheduling \

  sdkext \

  statsd \

  tethering \

  uwb \

  wifi \



$(foreach m, $(INDIVIDUALLY_TOGGLEABLE_PREBUILT_MODULES),\

  $(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

$(call add_soong_config_var_value,ANDROID,library_linking_strategy,prefer_static)