From 96a0ec11ba0545a56f6496c5a93ecb570a3ca7f7 Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Thu, 19 Sep 2024 22:46:24 +0800 Subject: [PATCH 1/8] gps: set default SUPL SSL method to SSLv23 Bug: 363886476 Test: verify SUPL NI test pass Change-Id: Iefe7acffac50ff14447b7d35c9c50e699637aba1 --- location/gps.6.1.xml.oriole | 2 +- location/gps.6.1.xml.raven | 2 +- location/gps.xml | 2 +- location/gps.xml.oriole | 2 +- location/gps.xml.raven | 2 +- location/gps_user.6.1.xml.oriole | 2 +- location/gps_user.6.1.xml.raven | 2 +- location/gps_user.xml | 2 +- location/gps_user.xml.oriole | 2 +- location/gps_user.xml.raven | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/location/gps.6.1.xml.oriole b/location/gps.6.1.xml.oriole index f442e3a..df40156 100644 --- a/location/gps.6.1.xml.oriole +++ b/location/gps.6.1.xml.oriole @@ -18,7 +18,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps.6.1.xml.raven b/location/gps.6.1.xml.raven index 3726311..c831068 100644 --- a/location/gps.6.1.xml.raven +++ b/location/gps.6.1.xml.raven @@ -18,7 +18,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps.xml b/location/gps.xml index 76eb81e..009aaec 100644 --- a/location/gps.xml +++ b/location/gps.xml @@ -18,7 +18,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps.xml.oriole b/location/gps.xml.oriole index 2f191d6..4833857 100644 --- a/location/gps.xml.oriole +++ b/location/gps.xml.oriole @@ -18,7 +18,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps.xml.raven b/location/gps.xml.raven index 3ddfe1c..d663ebf 100644 --- a/location/gps.xml.raven +++ b/location/gps.xml.raven @@ -18,7 +18,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps_user.6.1.xml.oriole b/location/gps_user.6.1.xml.oriole index ccea80d..0582009 100644 --- a/location/gps_user.6.1.xml.oriole +++ b/location/gps_user.6.1.xml.oriole @@ -17,7 +17,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps_user.6.1.xml.raven b/location/gps_user.6.1.xml.raven index 2230ace..c276c11 100644 --- a/location/gps_user.6.1.xml.raven +++ b/location/gps_user.6.1.xml.raven @@ -17,7 +17,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps_user.xml b/location/gps_user.xml index 405b8b6..008efb0 100644 --- a/location/gps_user.xml +++ b/location/gps_user.xml @@ -17,7 +17,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps_user.xml.oriole b/location/gps_user.xml.oriole index f935676..ec8d881 100644 --- a/location/gps_user.xml.oriole +++ b/location/gps_user.xml.oriole @@ -17,7 +17,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps_user.xml.raven b/location/gps_user.xml.raven index ff3c5e2..3489a66 100644 --- a/location/gps_user.xml.raven +++ b/location/gps_user.xml.raven @@ -17,7 +17,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" From dfdffd07a36af226fe58b0d8fc828a4dbd9c3a25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Grzegorz=20Ko=C5=82odziejczyk?= Date: Tue, 16 Jul 2024 11:54:42 +0000 Subject: [PATCH 2/8] audio: enable software encoded Bluetooth broadcast Bug: 345372436 Test: manual Flag: EXEMPT, trivial change Change-Id: I54a519bc01ae5886cdecd685b639e19dd35b0211 --- .../bluetooth_with_le_audio_policy_configuration_7_0.xml | 8 ++++++-- .../bluetooth_with_le_audio_policy_configuration_7_0.xml | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/audio/oriole/config/bluetooth_with_le_audio_policy_configuration_7_0.xml b/audio/oriole/config/bluetooth_with_le_audio_policy_configuration_7_0.xml index e3f27d9..efd7277 100644 --- a/audio/oriole/config/bluetooth_with_le_audio_policy_configuration_7_0.xml +++ b/audio/oriole/config/bluetooth_with_le_audio_policy_configuration_7_0.xml @@ -11,6 +11,7 @@ channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> + + + sources="le audio output"/> + - + \ No newline at end of file diff --git a/audio/raven/config/bluetooth_with_le_audio_policy_configuration_7_0.xml b/audio/raven/config/bluetooth_with_le_audio_policy_configuration_7_0.xml index e3f27d9..efd7277 100644 --- a/audio/raven/config/bluetooth_with_le_audio_policy_configuration_7_0.xml +++ b/audio/raven/config/bluetooth_with_le_audio_policy_configuration_7_0.xml @@ -11,6 +11,7 @@ channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> + + + sources="le audio output"/> + - + \ No newline at end of file From 18a37326718129529ccdea67bc8cc3489b5ddf66 Mon Sep 17 00:00:00 2001 From: Ravi Jain Date: Wed, 25 Sep 2024 06:27:13 +0000 Subject: [PATCH 3/8] 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: Ia283a1e770aabdce202318a09f51a0d0f0567b27 --- device-oriole.mk | 1 - device-raven.mk | 2 -- device-slider.mk | 1 - device-whitefin.mk | 1 - 4 files changed, 5 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 95cc084..52a9216 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -43,7 +43,6 @@ DEVICE_PACKAGE_OVERLAYS += device/google/raviole/oriole/overlay include device/google/raviole/audio/oriole/audio-tables.mk include device/google/gs101/device-shipping-common.mk include device/google/gs101/telephony/pktrouter.mk -include hardware/google/pixel/vibrator/cs40l25/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/stm/stm11.mk diff --git a/device-raven.mk b/device-raven.mk index 4ceb39e..3cfe900 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -60,8 +60,6 @@ ifeq ($(filter factory_raven, $(TARGET_PRODUCT)),) include device/google/raviole/uwb/uwb_calibration.mk endif -include hardware/google/pixel/vibrator/cs40l25/device.mk - # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,raven) $(call soong_config_set,lyric,tuning_product,raven) diff --git a/device-slider.mk b/device-slider.mk index 9a51f6f..f960cba 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -31,7 +31,6 @@ DEVICE_PACKAGE_OVERLAYS += device/google/raviole/slider/overlay include device/google/gs101/device-common.mk include device/google/raviole/audio/slider/audio-tables.mk -include hardware/google/pixel/vibrator/cs40l25/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/stm/stm11.mk diff --git a/device-whitefin.mk b/device-whitefin.mk index c9be012..d82b530 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -30,7 +30,6 @@ $(call inherit-product-if-exists, vendor/google_devices/raviole/proprietary/whit DEVICE_PACKAGE_OVERLAYS += device/google/raviole/whitefin/overlay include device/google/gs101/device-common.mk -include hardware/google/pixel/vibrator/drv2624/device.mk include device/google/raviole/audio/whitefin/audio-tables.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/gps/brcm/cbd_gps.mk From cf891d2ebe30ab91c287ea8b45694cb7df1c3bfb Mon Sep 17 00:00:00 2001 From: Jim Tang Date: Fri, 4 Oct 2024 15:30:30 +0800 Subject: [PATCH 4/8] 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 From 1ea54293900eae55e8daa6efe3152debfea1f3dc Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Thu, 26 Sep 2024 12:18:13 -0700 Subject: [PATCH 5/8] raviole: Pull init.insmod.*.cfg from vendor_dlkm We've started pushing init.insmod.*.cfg into the kernel prebuilts, and installing it to /vendor_dlkm/etc, but it may not be available on all prebuilt variants (e.g., kernel 5.10). Here, we: 1. conditionally install our common init.*cfg to /vendor_dlkm (only if $(TARGET_KERNEL_DIR) doesn't have a copy) 2. point init at /vendor_dlkm/etc When we've cycled completely off of kernel 5.10, we can drop #1. Bug: 369686096 Test: build, boot Flag: EXEMPT refactor Change-Id: Ibefafbcfe1fdf9b4e65ee3d73126c33f04ee193b --- conf/init.raviole.rc | 2 +- conf/init.slider.rc | 2 +- conf/init.whitefin.rc | 2 +- device-oriole.mk | 8 ++++++-- device-raven.mk | 8 ++++++-- device-slider.mk | 8 ++++++-- device-whitefin.mk | 8 ++++++-- 7 files changed, 27 insertions(+), 11 deletions(-) diff --git a/conf/init.raviole.rc b/conf/init.raviole.rc index a09cbae..f70546d 100644 --- a/conf/init.raviole.rc +++ b/conf/init.raviole.rc @@ -32,7 +32,7 @@ on boot && property:ro.build.type=userdebug && \ property:persist.vendor.fingerprint.disable.fake.override=100 setprop vendor.fingerprint.disable.fake ${persist.vendor.fingerprint.disable.fake.override} -service insmod_sh_raviole /vendor/bin/insmod.sh /vendor/etc/init.insmod.${ro.hardware}.cfg +service insmod_sh_raviole /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.${ro.hardware}.cfg class main user root group root system diff --git a/conf/init.slider.rc b/conf/init.slider.rc index 49c20ea..db78b71 100644 --- a/conf/init.slider.rc +++ b/conf/init.slider.rc @@ -16,7 +16,7 @@ on early-boot start insmod_sh_slider -service insmod_sh_slider /vendor/bin/insmod.sh /vendor/etc/init.insmod.slider.cfg +service insmod_sh_slider /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.slider.cfg class main user root group root system diff --git a/conf/init.whitefin.rc b/conf/init.whitefin.rc index 8894c75..b492fdd 100644 --- a/conf/init.whitefin.rc +++ b/conf/init.whitefin.rc @@ -14,7 +14,7 @@ on early-boot wait_for_prop vendor.common.modules.ready 1 start insmod_sh_whitefin -service insmod_sh_whitefin /vendor/bin/insmod.sh /vendor/etc/init.insmod.whitefin.cfg +service insmod_sh_whitefin /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.whitefin.cfg class main user root group root system diff --git a/device-oriole.mk b/device-oriole.mk index 8959feb..a59b2ed 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -69,9 +69,13 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/gs101/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.oriole.rc -# insmod files +# insmod files. Kernel 5.10 prebuilts don't provide these yet, so provide our +# own copy if they're not in the prebuilts. +# TODO(b/369686096): drop this when 5.10 is gone. +ifeq ($(wildcard $(TARGET_KERNEL_DIR)/init.insmod.*.cfg),) PRODUCT_COPY_FILES += \ - device/google/raviole/init.insmod.oriole.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.oriole.cfg + device/google/raviole/init.insmod.oriole.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.oriole.cfg +endif # Thermal Config PRODUCT_COPY_FILES += \ diff --git a/device-raven.mk b/device-raven.mk index d43d2cb..0b63ac5 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -77,9 +77,13 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/gs101/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.raven.rc -# insmod files +# insmod files. Kernel 5.10 prebuilts don't provide these yet, so provide our +# own copy if they're not in the prebuilts. +# TODO(b/369686096): drop this when 5.10 is gone. +ifeq ($(wildcard $(TARGET_KERNEL_DIR)/init.insmod.*.cfg),) PRODUCT_COPY_FILES += \ - device/google/raviole/init.insmod.raven.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.raven.cfg + device/google/raviole/init.insmod.raven.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.raven.cfg +endif # Thermal Config PRODUCT_COPY_FILES += \ diff --git a/device-slider.mk b/device-slider.mk index e49b151..5e90e1a 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -48,9 +48,13 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/gs101/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.slider.rc -# insmod files +# insmod files. Kernel 5.10 prebuilts don't provide these yet, so provide our +# own copy if they're not in the prebuilts. +# TODO(b/369686096): drop this when 5.10 is gone. +ifeq ($(wildcard $(TARGET_KERNEL_DIR)/init.insmod.*.cfg),) PRODUCT_COPY_FILES += \ - device/google/raviole/init.insmod.slider.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.slider.cfg + device/google/raviole/init.insmod.slider.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.slider.cfg +endif # Thermal Config PRODUCT_COPY_FILES += \ diff --git a/device-whitefin.mk b/device-whitefin.mk index 7dea345..94938f6 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -52,9 +52,13 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/gs101/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.whitefin.rc -# insmod files +# insmod files. Kernel 5.10 prebuilts don't provide these yet, so provide our +# own copy if they're not in the prebuilts. +# TODO(b/369686096): drop this when 5.10 is gone. +ifeq ($(wildcard $(TARGET_KERNEL_DIR)/init.insmod.*.cfg),) PRODUCT_COPY_FILES += \ - device/google/raviole/init.insmod.whitefin.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.whitefin.cfg + device/google/raviole/init.insmod.whitefin.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.whitefin.cfg +endif # Thermal Config PRODUCT_COPY_FILES += \ From 013069b4781ce6a91e69aed75587e01c2250aded Mon Sep 17 00:00:00 2001 From: Eileen Lai Date: Wed, 9 Oct 2024 08:13:38 +0000 Subject: [PATCH 6/8] modem_svc: use shared_modem_platform to replace all modem_svc_sit Bug: 368257019 Flag: EXEMPT resource only update Change-Id: I27053324a5b58fa290c3c1a3e5211812bf1acc58 --- device-oriole.mk | 7 +++++-- device-raven.mk | 7 +++++-- device-slider.mk | 7 +++++-- device-whitefin.mk | 7 +++++-- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index a59b2ed..b38f140 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -159,8 +159,11 @@ PRODUCT_PACKAGES += \ android.hardware.nfc-service.st \ NfcOverlayOriole -# modem_svc_sit daemon -PRODUCT_PACKAGES += modem_svc_sit +# Shared Modem Platform +SHARED_MODEM_PLATFORM_VENDOR := lassen + +# Shared Modem Platform +include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk # SecureElement PRODUCT_PACKAGES += \ diff --git a/device-raven.mk b/device-raven.mk index 0b63ac5..49ff1e0 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -164,8 +164,11 @@ PRODUCT_PACKAGES += \ android.hardware.nfc-service.st \ NfcOverlayRaven -# modem_svc_sit daemon -PRODUCT_PACKAGES += modem_svc_sit +# Shared Modem Platform +SHARED_MODEM_PLATFORM_VENDOR := lassen + +# Shared Modem Platform +include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk # SecureElement PRODUCT_PACKAGES += \ diff --git a/device-slider.mk b/device-slider.mk index 5e90e1a..f47ab65 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -95,8 +95,11 @@ PRODUCT_PACKAGES += \ Tag \ android.hardware.nfc-service.st -# modem_svc_sit daemon -PRODUCT_PACKAGES += modem_svc_sit +# Shared Modem Platform +SHARED_MODEM_PLATFORM_VENDOR := lassen + +# Shared Modem Platform +include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk # SecureElement PRODUCT_PACKAGES += \ diff --git a/device-whitefin.mk b/device-whitefin.mk index 94938f6..41a969c 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -91,8 +91,11 @@ PRODUCT_PACKAGES += \ Tag \ android.hardware.nfc-service.st -# modem_svc_sit daemon -PRODUCT_PACKAGES += modem_svc_sit +# Shared Modem Platform +SHARED_MODEM_PLATFORM_VENDOR := lassen + +# Shared Modem Platform +include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk # PowerStats HAL PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/whitefin From d009e5b1182af50dcf8f005e4f7036657ff9a819 Mon Sep 17 00:00:00 2001 From: kellyhung Date: Wed, 6 Nov 2024 05:55:01 +0000 Subject: [PATCH 7/8] Add PLAYVIDEOS_VERSION_DIR and PRODUCT_SOONG_NAMESPACES for Videos. Bug: 377402842 Test: m Video Flag: EXEMPT bugfix Change-Id: Ic3041f2726d8de35bc8eb8591c7535d560b80349 --- device-oriole.mk | 5 +++++ device-raven.mk | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index b38f140..5e161ac 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -364,3 +364,8 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk) endif endif + +# PlayVideos +PLAYVIDEOS_VERSION_DIR := 4.20.6 +$(call soong_config_set_bool,playvideos,use_device_specific_version,true) +PRODUCT_SOONG_NAMESPACES += vendor/unbundled_google/packages/PlayVideos/$(PLAYVIDEOS_VERSION_DIR) diff --git a/device-raven.mk b/device-raven.mk index 49ff1e0..54cccdc 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -373,3 +373,8 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk) endif endif + +# PlayVideos +PLAYVIDEOS_VERSION_DIR := 4.20.6 +$(call soong_config_set_bool,playvideos,use_device_specific_version,true) +PRODUCT_SOONG_NAMESPACES += vendor/unbundled_google/packages/PlayVideos/$(PLAYVIDEOS_VERSION_DIR) From 5003ac58530f53d00f7fa9c9666c544b9aa31222 Mon Sep 17 00:00:00 2001 From: Eileen Lai Date: Sun, 8 Dec 2024 07:40:05 +0000 Subject: [PATCH 8/8] modem_svc: use modem_svc_sit version sepolicy For solving sepolicy conflicts for different AP version, modem_svc_sit will support devices from gs101 to zuma_pro. Bug: 372400955 Change-Id: Ib0bef5f0b5eae98af594d65f2077ff4c05eafc42 Flag: NONE local testing only --- device-oriole.mk | 2 +- device-raven.mk | 2 +- device-slider.mk | 2 +- device-whitefin.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 5e161ac..c087157 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -163,7 +163,7 @@ PRODUCT_PACKAGES += \ SHARED_MODEM_PLATFORM_VENDOR := lassen # Shared Modem Platform -include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk +include device/google/gs-common/modem/modem_svc_sit/shared_modem_platform.mk # SecureElement PRODUCT_PACKAGES += \ diff --git a/device-raven.mk b/device-raven.mk index 54cccdc..6833ea4 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -168,7 +168,7 @@ PRODUCT_PACKAGES += \ SHARED_MODEM_PLATFORM_VENDOR := lassen # Shared Modem Platform -include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk +include device/google/gs-common/modem/modem_svc_sit/shared_modem_platform.mk # SecureElement PRODUCT_PACKAGES += \ diff --git a/device-slider.mk b/device-slider.mk index f47ab65..dbbeda3 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -99,7 +99,7 @@ PRODUCT_PACKAGES += \ SHARED_MODEM_PLATFORM_VENDOR := lassen # Shared Modem Platform -include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk +include device/google/gs-common/modem/modem_svc_sit/shared_modem_platform.mk # SecureElement PRODUCT_PACKAGES += \ diff --git a/device-whitefin.mk b/device-whitefin.mk index 41a969c..4f51022 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -95,7 +95,7 @@ PRODUCT_PACKAGES += \ SHARED_MODEM_PLATFORM_VENDOR := lassen # Shared Modem Platform -include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk +include device/google/gs-common/modem/modem_svc_sit/shared_modem_platform.mk # PowerStats HAL PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/whitefin