From 12decc0c3fd2eb679a675433797057b35c685821 Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Tue, 16 Aug 2022 14:03:33 +0800 Subject: [PATCH] move bcmbt settings to gs-common Bug: 242661555 Test: build pass Change-Id: I270699acef0b35d5e76a41c8f04f787d46590d10 --- device-felix.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/device-felix.mk b/device-felix.mk index 651bf90..8b5f0a3 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -30,7 +30,7 @@ include device/google/felix/audio/felix/audio-tables.mk include device/google/gs201/device-shipping-common.mk $(call soong_config_set,fp_hal_feature,pixel_product, product_a) include hardware/google/pixel/vibrator/cs40l26/device-stereo.mk -include device/google/gs101/bluetooth/bluetooth.mk +include device/google/gs-common/bcmbt/bluetooth.mk ifeq ($(filter factory_felix, $(TARGET_PRODUCT)),) include device/google/felix/uwb/uwb_calibration.mk endif @@ -119,7 +119,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/felix/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf