diff options
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-04-24 01:30:43 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-24 01:30:43 +0000 |
commit | 7123699d09d6c74f278575db9fead3bfc09bd6e2 (patch) | |
tree | 36839f4832a728557a50b01a2a0d44807a3cdfb3 | |
parent | 171944d88a45d506611067dbf66eaab627bfd3e2 (diff) | |
parent | 8ec0862bdd20ed866c17aaadf48e6453406dc01e (diff) | |
download | build-7123699d09d6c74f278575db9fead3bfc09bd6e2.tar.gz |
Merge "Drop INDIVIDUALLY_TOGGLEABLE_PREBUILT_MODULES" into main
-rw-r--r-- | core/android_soong_config_vars.mk | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index a9303d177c..b35d9f8643 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -78,34 +78,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) |