1 files changed, 23 insertions, 0 deletions
diff --git a/packages/SettingsLib/Android.bp b/packages/SettingsLib/Android.bp
index a65bf41210a1..44a1b114fe69 100644
--- a/packages/SettingsLib/Android.bp
+++ b/packages/SettingsLib/Android.bp
@@ -7,12 +7,35 @@ package {
     default_applicable_licenses: ["frameworks_base_license"],
 }
 
+soong_config_module_type_import {
+    from: "device/qcom/qssi/Android.bp",
+    module_types: [
+         "bredr_vs_btadva_java_defaults",
+    ],
+}
+
+bredr_vs_btadva_java_defaults {
+    name: "btadva_settings_lib_java_defaults",
+
+    soong_config_variables: {
+        bredr_or_btadva: {
+           btadva: {
+              srcs: [
+                 ":framework-settingslib-adva-srcs",
+              ],
+           }
+       }
+   }
+}
+
 android_library {
 
     name: "SettingsLib",
 
     defaults: [
         "SettingsLibDependenciesWithoutWifiTracker",
+        "framework-wifi-vendor-hide-access-defaults",
+        "btadva_settings_lib_java_defaults",
     ],
 
     // TODO(b/149540986): revert this change.