thermal: Update thermal table am: af86dce11f am: a15862ee32 am: 1a5e0c2a93
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/15301296
Change-Id: I2a585ff6ce06679fd87c15b2046d72faedeed942
diff --git a/device-oriole.mk b/device-oriole.mk
index 4f4e99c..4cfaba3 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -158,3 +158,8 @@
# Enable camera exif model/make reporting
PRODUCT_PRODUCT_PROPERTIES += \
persist.vendor.camera.exif_reveal_make_model=true
+
+# Bluetooth HAL
+PRODUCT_PACKAGES += \
+ android.hardware.bluetooth@1.1-service.bcmbtlinux \
+ bt_vendor.conf
diff --git a/device-raven.mk b/device-raven.mk
index fff0e88..ebe8226 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -159,3 +159,8 @@
# Enable camera exif model/make reporting
PRODUCT_PRODUCT_PROPERTIES += \
persist.vendor.camera.exif_reveal_make_model=true
+
+# Bluetooth HAL
+PRODUCT_PACKAGES += \
+ android.hardware.bluetooth@1.1-service.bcmbtlinux \
+ bt_vendor.conf
diff --git a/device-slider.mk b/device-slider.mk
index f4e6b57..a56ff29 100644
--- a/device-slider.mk
+++ b/device-slider.mk
@@ -77,3 +77,8 @@
# Trusty liboemcrypto.so
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts
+
+# Bluetooth HAL
+PRODUCT_PACKAGES += \
+ android.hardware.bluetooth@1.1-service.bcmbtlinux \
+ bt_vendor.conf
diff --git a/device-whitefin.mk b/device-whitefin.mk
index 17e4d45..7794a4e 100644
--- a/device-whitefin.mk
+++ b/device-whitefin.mk
@@ -63,3 +63,8 @@
# Trusty liboemcrypto.so
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts
+
+# Bluetooth HAL
+PRODUCT_PACKAGES += \
+ android.hardware.bluetooth@1.1-service.bcmbtlinux \
+ bt_vendor.conf
diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk
index 6d752a4..c3f2cc7 100644
--- a/raven/BoardConfig.mk
+++ b/raven/BoardConfig.mk
@@ -13,11 +13,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt
-TARGET_BOOTLOADER_BOARD_NAME := raven
-TARGET_SCREEN_DENSITY := 560
-USES_DEVICE_GOOGLE_RAVIOLE := true
-include device/google/gs101/BoardConfig-common.mk
--include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk
--include vendor/google_devices/raven/proprietary/BoardConfigVendor.mk
+ifdef PHONE_CAR_BOARD_CONFIG
+ include $(PHONE_CAR_BOARD_CONFIG)
+else
+ TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt
+ TARGET_BOOTLOADER_BOARD_NAME := raven
+ TARGET_SCREEN_DENSITY := 560
+ USES_DEVICE_GOOGLE_RAVIOLE := true
+
+ include device/google/gs101/BoardConfig-common.mk
+ -include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk
+ -include vendor/google_devices/raven/proprietary/BoardConfigVendor.mk
+endif