From cf891d2ebe30ab91c287ea8b45694cb7df1c3bfb Mon Sep 17 00:00:00 2001 From: Jim Tang Date: Fri, 4 Oct 2024 15:30:30 +0800 Subject: [PATCH] Move modem_svc_sit from gs101 to raviole Module `modem_svc_sit` is not valid unless: * USES_LASSEN_MODEM is true * BOARD_WITHOUT_RADIO is NOT true (or NOT set) Devices in gs101 family will set "USES_LASSEN_MODEM := true"; however, not evevy gs101 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: Ib3f7c8b0376e7cdec70e4baaf37e7a43c7d41333 --- device-oriole.mk | 3 +++ device-raven.mk | 3 +++ device-slider.mk | 3 +++ device-whitefin.mk | 3 +++ 4 files changed, 12 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index 52a9216..8959feb 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -155,6 +155,9 @@ PRODUCT_PACKAGES += \ android.hardware.nfc-service.st \ NfcOverlayOriole +# modem_svc_sit daemon +PRODUCT_PACKAGES += modem_svc_sit + # SecureElement PRODUCT_PACKAGES += \ android.hardware.secure_element@1.2-service-gto \ diff --git a/device-raven.mk b/device-raven.mk index 3cfe900..d43d2cb 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -160,6 +160,9 @@ PRODUCT_PACKAGES += \ android.hardware.nfc-service.st \ NfcOverlayRaven +# modem_svc_sit daemon +PRODUCT_PACKAGES += modem_svc_sit + # SecureElement PRODUCT_PACKAGES += \ android.hardware.secure_element@1.2-service-gto \ diff --git a/device-slider.mk b/device-slider.mk index f960cba..e49b151 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -91,6 +91,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-whitefin.mk b/device-whitefin.mk index d82b530..7dea345 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -87,6 +87,9 @@ PRODUCT_PACKAGES += \ Tag \ android.hardware.nfc-service.st +# modem_svc_sit daemon +PRODUCT_PACKAGES += modem_svc_sit + # PowerStats HAL PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/whitefin