diff --git a/BoardConfig.mk b/BoardConfig.mk
index 8eed565..33961ed 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -48,8 +48,6 @@ DEVICE_MANIFEST_FILE := device/nintendo/nx/manifests/manifest.xml
 
 # Bluetooth
 TARGET_VENDOR_PROP += device/nintendo/nx/bluetooth.prop
-BOARD_CUSTOM_BT_CONFIG := device/nintendo/nx/comms/vnd_nx.txt
-BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/nintendo/nx/comms
 
 # Charger
 WITH_LINEAGE_CHARGER := false
diff --git a/comms/Android.bp b/comms/Android.bp
new file mode 100644
index 0000000..2d5b923
--- /dev/null
+++ b/comms/Android.bp
@@ -0,0 +1,4 @@
+filegroup {
+    name: "vnd_nx.txt",
+    srcs: ["vnd_nx.txt"],
+}
diff --git a/device.mk b/device.mk
index 9d6ab10..a8fb00e 100644
--- a/device.mk
+++ b/device.mk
@@ -106,6 +106,10 @@ PRODUCT_PACKAGES += \
     audio_policy_configuration.xml \
     nvaudio_conf.xml
 
+# Bluetooth
+$(call soong_config_set,brcm_libbt,bdroid_buildcfg_include_dir,device/nintendo/nx/comms)
+$(call soong_config_set,brcm_libbt,custom_bt_config,//device/nintendo/nx:vnd_nx.txt)
+
 # CEC
 PRODUCT_COPY_FILES := $(filter-out frameworks/native/data/etc/android.hardware.hdmi.cec.xml%android.hardware.hdmi.cec.xml,$(PRODUCT_COPY_FILES))