diff --git a/bluetooth/bluetooth.mk b/bluetooth/bluetooth.mk
new file mode 100644
index 0000000..6f9a9d7
--- /dev/null
+++ b/bluetooth/bluetooth.mk
@@ -0,0 +1,13 @@
+PRODUCT_SOONG_NAMESPACES += vendor/google/connectivity/bluetooth/common
+PRODUCT_PACKAGES += \
+ android.hardware.bluetooth-V1-ndk.so \
+ android.hardware.bluetooth.finder-V1-ndk.so \
+ android.hardware.bluetooth.ranging-V1-ndk.so \
+ android.hardware.bluetooth-service.pixel \
+ vendor.google.bluetooth_ext-V1-ndk.so \
+ bt_vendor.conf \
+ android.hardware.bluetooth.prebuilt.xml \
+ android.hardware.bluetooth_le.prebuilt.xml
+
+DEVICE_MANIFEST_FILE += device/google/gs-common/bluetooth/manifest_bluetooth.xml
+DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs-common/bluetooth/compatibility_matrix.xml
diff --git a/bluetooth/compatibility_matrix.xml b/bluetooth/compatibility_matrix.xml
new file mode 100644
index 0000000..65b0c6d
--- /dev/null
+++ b/bluetooth/compatibility_matrix.xml
@@ -0,0 +1,30 @@
+
+
+ vendor.google.bluetooth_ext
+ 1
+
+ IBluetoothFinder
+ default
+
+
+ IBluetoothCcc
+ default
+
+
+ IBTChannelAvoidance
+ default
+
+
+ IBluetoothSar
+ default
+
+
+ IBluetoothExt
+ default
+
+
+ IBluetoothEwp
+ default
+
+
+
diff --git a/bluetooth/manifest_bluetooth.xml b/bluetooth/manifest_bluetooth.xml
new file mode 100644
index 0000000..a72f1c9
--- /dev/null
+++ b/bluetooth/manifest_bluetooth.xml
@@ -0,0 +1,27 @@
+
+
+ android.hardware.bluetooth
+ 1
+ IBluetoothHci/default
+
+
+ android.hardware.bluetooth.finder
+ 1
+ IBluetoothFinder/default
+
+
+ android.hardware.bluetooth.ranging
+ 1
+ IBluetoothChannelSounding/default
+
+
+ vendor.google.bluetooth_ext
+ 1
+ IBTChannelAvoidance/default
+ IBluetoothCcc/default
+ IBluetoothEwp/default
+ IBluetoothExt/default
+ IBluetoothFinder/default
+ IBluetoothSar/default
+
+