From 8dbfc347b89057f0fe12253d527f6dd49f1391c0 Mon Sep 17 00:00:00 2001 From: Ravi Jain Date: Wed, 25 Sep 2024 06:26:18 +0000 Subject: [PATCH 1/2] Remove vibrator HAL service Remove from device mk files due to relocation to vendor directory. Bug: 362659323 Test: Build Pass Flag: EXEMPT refactor Change-Id: I8ccf97fed8c7917f93ff4a9748fa8e3e3aa6fdc0 --- device-cheetah.mk | 1 - device-cloudripper.mk | 1 - device-panther.mk | 1 - device-ravenclaw.mk | 1 - 4 files changed, 4 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 4bfe74a..5310870 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -48,7 +48,6 @@ 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/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/syna/syna0.mk diff --git a/device-cloudripper.mk b/device-cloudripper.mk index 4896cda..6a3638f 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -38,7 +38,6 @@ $(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/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/gps/brcm/cbd_gps.mk include device/google/gs-common/touch/syna/syna0.mk diff --git a/device-panther.mk b/device-panther.mk index a50f2ea..08cf3bb 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -46,7 +46,6 @@ 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/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/focaltech/focaltech.mk diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk index 115bdc7..86c1858 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -38,7 +38,6 @@ $(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/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/lsi/lsi.mk From cedffc0b92712ac008cba51fa8803c34d37192fc Mon Sep 17 00:00:00 2001 From: Jim Tang Date: Fri, 4 Oct 2024 15:56:41 +0800 Subject: [PATCH 2/2] Move modem_svc_sit from gs201 to pantah Module `modem_svc_sit` is not valid unless: * USES_LASSEN_MODEM is true * BOARD_WITHOUT_RADIO is NOT true (or NOT set) Devices in gs201 family will set "USES_LASSEN_MODEM := true"; however, not evevy gs201 device disables BOARD_WITHOUT_RADIO. This commit defines PRODUCT_PACKAGES `modem_svc_sit` because it is converted from bp by moving the if-statement constrain from the module level to device level. Flag: EXEMPT refactor Bug: 358485346 Test: m modem_svc_sit Change-Id: Ie8ab9f12007b0faa3fb90e9ff0b0bb3f66e20593 --- device-cheetah.mk | 3 +++ device-cloudripper.mk | 3 +++ device-panther.mk | 3 +++ factory_ravenclaw.mk | 3 +++ 4 files changed, 12 insertions(+) diff --git a/device-cheetah.mk b/device-cheetah.mk index 5310870..719ccd6 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -130,6 +130,9 @@ PRODUCT_PACKAGES += \ android.hardware.nfc-service.st \ NfcOverlayCheetah +# modem_svc_sit daemon +PRODUCT_PACKAGES += modem_svc_sit + # SecureElement PRODUCT_PACKAGES += \ android.hardware.secure_element@1.2-service-gto \ diff --git a/device-cloudripper.mk b/device-cloudripper.mk index 6a3638f..527cb14 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -79,6 +79,9 @@ PRODUCT_PACKAGES += \ Tag \ android.hardware.nfc-service.st +# modem_svc_sit daemon +PRODUCT_PACKAGES += modem_svc_sit + # SecureElement PRODUCT_PACKAGES += \ android.hardware.secure_element@1.2-service-gto \ diff --git a/device-panther.mk b/device-panther.mk index 08cf3bb..f376135 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -109,6 +109,9 @@ PRODUCT_PACKAGES += \ android.hardware.nfc-service.st \ NfcOverlayPanther +# modem_svc_sit daemon +PRODUCT_PACKAGES += modem_svc_sit + # SecureElement PRODUCT_PACKAGES += \ android.hardware.secure_element@1.2-service-gto \ diff --git a/factory_ravenclaw.mk b/factory_ravenclaw.mk index cd07164..0e2b679 100644 --- a/factory_ravenclaw.mk +++ b/factory_ravenclaw.mk @@ -29,3 +29,6 @@ PRODUCT_MANUFACTURER := Google # default BDADDR for EVB only PRODUCT_PROPERTY_OVERRIDES += \ ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" + +# modem_svc_sit daemon +PRODUCT_PACKAGES += modem_svc_sit