From 6a9883e60947c1709fa3a3bb60d78a630074e3f4 Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Tue, 16 Aug 2022 14:02:51 +0800 Subject: [PATCH] move bcmbt settings to gs-common Bug: 242661555 Test: build pass Change-Id: Iace4472741e429192235bd618878cd3b8b0f33b3 --- device-cheetah.mk | 3 +-- device-cloudripper.mk | 3 +-- device-panther.mk | 3 +-- device-ravenclaw.mk | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index b9c4ebc..fba3e1a 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -29,7 +29,7 @@ DEVICE_PACKAGE_OVERLAYS += device/google/pantah/cheetah/overlay include device/google/pantah/audio/cheetah/audio-tables.mk include device/google/gs201/device-shipping-common.mk include hardware/google/pixel/vibrator/cs40l26/device.mk -include device/google/gs101/bluetooth/bluetooth.mk +include device/google/gs-common/bcmbt/bluetooth.mk DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/pantah/device_framework_matrix_product.xml ifeq ($(filter factory_cheetah, $(TARGET_PRODUCT)),) @@ -145,7 +145,6 @@ DEVICE_MANIFEST_FILE += \ PRODUCT_SOONG_NAMESPACES += \ vendor/broadcom/bluetooth PRODUCT_PACKAGES += \ - android.hardware.bluetooth@1.1-service.bcmbtlinux \ bt_vendor.conf PRODUCT_COPY_FILES += \ device/google/pantah/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf diff --git a/device-cloudripper.mk b/device-cloudripper.mk index d90c4af..6eeaddd 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -25,7 +25,7 @@ $(call inherit-product-if-exists, vendor/google_devices/pantah/proprietary/cloud include device/google/gs201/device-shipping-common.mk include device/google/pantah/audio/cloudripper/audio-tables.mk include hardware/google/pixel/vibrator/cs40l26/device.mk -include device/google/gs101/bluetooth/bluetooth.mk +include device/google/gs-common/bcmbt/bluetooth.mk DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/pantah/device_framework_matrix_product.xml $(call soong_config_set,lyric,tuning_product,cloudripper) @@ -99,7 +99,6 @@ DEVICE_MANIFEST_FILE += \ PRODUCT_SOONG_NAMESPACES += \ vendor/broadcom/bluetooth PRODUCT_PACKAGES += \ - android.hardware.bluetooth@1.1-service.bcmbtlinux \ bt_vendor.conf PRODUCT_COPY_FILES += \ device/google/pantah/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf diff --git a/device-panther.mk b/device-panther.mk index 027d843..5684383 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -29,7 +29,7 @@ DEVICE_PACKAGE_OVERLAYS += device/google/pantah/panther/overlay include device/google/pantah/audio/panther/audio-tables.mk include device/google/gs201/device-shipping-common.mk include hardware/google/pixel/vibrator/cs40l26/device.mk -include device/google/gs101/bluetooth/bluetooth.mk +include device/google/gs-common/bcmbt/bluetooth.mk DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/pantah/device_framework_matrix_product.xml $(call soong_config_set,lyric,tuning_product,panther) @@ -128,7 +128,6 @@ DEVICE_MANIFEST_FILE += \ PRODUCT_SOONG_NAMESPACES += \ vendor/broadcom/bluetooth PRODUCT_PACKAGES += \ - android.hardware.bluetooth@1.1-service.bcmbtlinux \ bt_vendor.conf PRODUCT_COPY_FILES += \ device/google/pantah/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk index 27a1cdd..3b63de3 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -25,7 +25,7 @@ $(call inherit-product-if-exists, vendor/google_devices/pantah/proprietary/raven include device/google/gs201/device-shipping-common.mk include device/google/pantah/audio/ravenclaw/audio-tables.mk include hardware/google/pixel/vibrator/cs40l26/device.mk -include device/google/gs101/bluetooth/bluetooth.mk +include device/google/gs-common/bcmbt/bluetooth.mk DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/pantah/device_framework_matrix_product.xml ifeq ($(filter factory_ravenclaw, $(TARGET_PRODUCT)),) @@ -97,7 +97,6 @@ DEVICE_MANIFEST_FILE += \ PRODUCT_SOONG_NAMESPACES += \ vendor/broadcom/bluetooth PRODUCT_PACKAGES += \ - android.hardware.bluetooth@1.1-service.bcmbtlinux \ bt_vendor.conf PRODUCT_COPY_FILES += \ device/google/pantah/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf