WLC: Include the wireless_charger from gs-common
Bug: 237600973
Change-Id: Ib484b481f2f6193e14f397e240d6207b21dc7990
Signed-off-by: Ken Yang <yangken@google.com>
diff --git a/device-oriole.mk b/device-oriole.mk
index d35ed59..b9a1f65 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -36,6 +36,9 @@
include device/google/gs-common/bcmbt/bluetooth.mk
include device/google/gs-common/touch/stm/stm11.mk
+# wireless_charger HAL service
+include device/google/gs-common/wireless_charger/wireless_charger.mk
+
ifeq ($(filter factory_oriole, $(TARGET_PRODUCT)),)
include device/google/gs101/fingerprint/udfps_shipping.mk
else
@@ -103,10 +106,6 @@
PRODUCT_COPY_FILES += \
device/google/raviole/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf
-
-# WirelessCharger
-DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs101/device_framework_matrix_product_wireless.xml
-
# MIPI Coex Configs
PRODUCT_COPY_FILES += \
device/google/raviole/radio/oriole_display_mipi_coex_table.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/display_primary_mipi_coex_table.csv \
diff --git a/device-raven.mk b/device-raven.mk
index a9ec847..5eec93b 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -35,6 +35,10 @@
include device/google/gs-common/bcmbt/bluetooth.mk
include device/google/gs-common/touch/lsi/lsi.mk
+# wireless_charger HAL service
+include device/google/gs-common/wireless_charger/wireless_charger.mk
+
+
ifeq ($(filter factory_raven, $(TARGET_PRODUCT)),)
include device/google/gs101/fingerprint/udfps_shipping.mk
else
@@ -110,9 +114,6 @@
persist.bluetooth.le_audio_test=false
endif
-# WirelessCharger
-DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs101/device_framework_matrix_product_wireless.xml
-
# MIPI Coex Configs
PRODUCT_COPY_FILES += \
device/google/raviole/radio/raven_camera_rear_tele_mipi_coex_table.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/camera_rear_tele_mipi_coex_table.csv
diff --git a/device-slider.mk b/device-slider.mk
index 60a0729..35f828a 100644
--- a/device-slider.mk
+++ b/device-slider.mk
@@ -30,14 +30,14 @@
include device/google/gs-common/bcmbt/bluetooth.mk
include device/google/gs-common/touch/stm/stm11.mk
+# wireless_charger HAL service
+include device/google/gs-common/wireless_charger/wireless_charger.mk
+
# go/lyric-soong-variables
$(call soong_config_set,lyric,camera_hardware,slider)
$(call soong_config_set,lyric,tuning_product,slider)
$(call soong_config_set,google3a_config,target_device,slider)
-# WirelessCharger
-DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs101/device_framework_matrix_product_wireless.xml
-
# Init files
PRODUCT_COPY_FILES += \
device/google/raviole/conf/init.slider.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.slider.rc
diff --git a/device-whitefin.mk b/device-whitefin.mk
index 35ea738..7c2a533 100644
--- a/device-whitefin.mk
+++ b/device-whitefin.mk
@@ -30,14 +30,15 @@
include device/google/gs-common/bcmbt/bluetooth.mk
include device/google/gs-common/touch/lsi/lsi.mk
+# wireless_charger HAL service needs to be included specially due to no raviole-sepolicy folder
+PRODUCT_PACKAGES += vendor.google.wireless_charger-default
+DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs-common/wireless_charger/compatibility_matrix.xml
+
# go/lyric-soong-variables
$(call soong_config_set,lyric,camera_hardware,slider)
$(call soong_config_set,lyric,tuning_product,slider)
$(call soong_config_set,google3a_config,target_device,slider)
-# WirelessCharger
-DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs101/device_framework_matrix_product_wireless.xml
-
# Init files
PRODUCT_COPY_FILES += \
device/google/raviole/conf/init.whitefin.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.whitefin.rc