diff --git a/bluetooth/bt_vendor_overlay.conf b/bluetooth/bt_vendor_overlay.conf deleted file mode 100644 index 9c44fe00..00000000 --- a/bluetooth/bt_vendor_overlay.conf +++ /dev/null @@ -1,4 +0,0 @@ -# This is BTBCM HAL overlay configuration file. - -# Uart port name -UartPort = /dev/ttySAC18 diff --git a/device.mk b/device.mk index 2ca533ac..1dae750e 100644 --- a/device.mk +++ b/device.mk @@ -42,8 +42,7 @@ PRODUCT_SOONG_NAMESPACES += \ vendor/google_devices/common/proprietary/confirmatioui_hal \ vendor/google_nos/host/android \ vendor/google_nos/test/system-test-harness \ - vendor/google/camera \ - vendor/broadcom/bluetooth + vendor/google/camera DEVICE_USES_EXYNOS_GRALLOC_VERSION := 4 @@ -754,14 +753,10 @@ PRODUCT_PACKAGES += \ PRODUCT_PROPERTY_OVERRIDES += \ ro.frp.pst=/dev/block/by-name/frp -# Bluetooth HAL -PRODUCT_PACKAGES += \ - android.hardware.bluetooth@1.1-service.bcmbtlinux \ - bt_vendor.conf +# Bluetooth PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.bluetooth.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth.xml \ - frameworks/native/data/etc/android.hardware.bluetooth_le.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth_le.xml \ - device/google/gs201/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf + frameworks/native/data/etc/android.hardware.bluetooth_le.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth_le.xml # System props to enable Bluetooth Quality Report (BQR) feature ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))