move bt_vendor.conf to gs-common
Bug: 242661555
Test: vts-tradefed run vts -m vts_treble_vintf_vendor_test
Change-Id: I5ea3ed9ff12a3abc2f982c15392ecd4e8c2a2d5f
diff --git a/device-raven.mk b/device-raven.mk
index b341543..e88672c 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -86,12 +86,24 @@
$(LOCAL_PATH)/bluetooth_power_limits_raven_eu.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_EU.csv \
$(LOCAL_PATH)/bluetooth_power_limits_raven_jp.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_JP.csv
+# Bluetooth HAL
+PRODUCT_COPY_FILES += \
+ device/google/raviole/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf
# Bluetooth Hal Extension test tools
PRODUCT_PACKAGES_DEBUG += \
sar_test \
hci_inject
+# userdebug specific
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+# Bluetooth LE Audio Hardware offload
+PRODUCT_PRODUCT_PROPERTIES += \
+ ro.bluetooth.leaudio_offload.supported=true \
+ persist.bluetooth.leaudio_offload.disabled=true \
+ persist.bluetooth.le_audio_test=false
+endif
+
# WirelessCharger
DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs101/device_framework_matrix_product_wireless.xml
@@ -224,12 +236,6 @@
PRODUCT_VENDOR_PROPERTIES += \
persist.vendor.camera.exif_reveal_make_model=true
-# Bluetooth HAL
-PRODUCT_PACKAGES += \
- bt_vendor.conf
-PRODUCT_COPY_FILES += \
- device/google/raviole/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf
-
# tetheroffload HAL
PRODUCT_PACKAGES += \
vendor.samsung_slsi.hardware.tetheroffload@1.1-service
@@ -245,15 +251,6 @@
# This device is shipped with 31 (Android S)
PRODUCT_SHIPPING_API_LEVEL := 31
-# userdebug specific
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-# Bluetooth LE Audio Hardware offload
-PRODUCT_PRODUCT_PROPERTIES += \
- ro.bluetooth.leaudio_offload.supported=true \
- persist.bluetooth.leaudio_offload.disabled=true \
- persist.bluetooth.le_audio_test=false
-endif
-
# declare use of spatial audio
PRODUCT_PROPERTY_OVERRIDES += \
ro.audio.spatializer_enabled=true