From 8fe73d6dee16247a138366389d2d3170816d4a54 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Sat, 26 Oct 2024 00:46:17 +0300 Subject: [PATCH] caimito: Add PixelImsMediaService Change-Id: I2bf94759e28bea4ca8afe4d79bc5c6328f84e51d --- caiman/extract-files.sh | 2 ++ caiman/proprietary-files-vendor.txt | 4 ++-- caiman/proprietary-files.txt | 4 ++++ caiman/setup-makefiles.sh | 4 +++- komodo/extract-files.sh | 2 ++ komodo/proprietary-files-vendor.txt | 4 ++-- komodo/proprietary-files.txt | 4 ++++ komodo/setup-makefiles.sh | 4 +++- tokay/extract-files.sh | 2 ++ tokay/proprietary-files-vendor.txt | 4 ++-- tokay/proprietary-files.txt | 4 ++++ tokay/setup-makefiles.sh | 4 +++- 12 files changed, 33 insertions(+), 9 deletions(-) diff --git a/caiman/extract-files.sh b/caiman/extract-files.sh index 45d5135a..503bb45c 100755 --- a/caiman/extract-files.sh +++ b/caiman/extract-files.sh @@ -116,6 +116,8 @@ if [ -z "${ONLY_FIRMWARE}" ]; then set_module_suffix "vendor/lib64/com.google.edgetpu_app_service-V4-ndk.so" "-vendor" "${VENDOR_TXT}" set_module_suffix "vendor/lib64/com.google.edgetpu_vendor_service-V2-ndk.so" "-vendor" "${VENDOR_TXT}" + set_module_suffix "vendor/lib64/vendor.google.whitechapel.audio.audioext@4.0.so" "-vendor" "${VENDOR_TXT}" + set_module_suffix "vendor/lib64/vendor.google.whitechapel.audio.extension-V2-ndk.so" "-vendor" "${VENDOR_TXT}" extract "${MY_DIR}/proprietary-files-vendor.txt" "${SRC}" "${KANG}" --section "${SECTION}" fi diff --git a/caiman/proprietary-files-vendor.txt b/caiman/proprietary-files-vendor.txt index 1aa31b21..55b0cf76 100644 --- a/caiman/proprietary-files-vendor.txt +++ b/caiman/proprietary-files-vendor.txt @@ -2841,8 +2841,8 @@ vendor/lib64/vendor.google.battery_mitigation.service_static.so vendor/lib64/vendor.google.bluetooth_ext-V1-ndk.so vendor/lib64/vendor.google.google_battery-V3-ndk.so vendor/lib64/vendor.google.radio_ext-V1-ndk.so -vendor/lib64/vendor.google.whitechapel.audio.audioext@4.0.so -vendor/lib64/vendor.google.whitechapel.audio.extension-V2-ndk.so +vendor/lib64/vendor.google.whitechapel.audio.audioext@4.0.so;MODULE_SUFFIX=-vendor +vendor/lib64/vendor.google.whitechapel.audio.extension-V2-ndk.so;MODULE_SUFFIX=-vendor vendor/lib64/vendor.google.whitechapel.audio.hal.audio.so vendor/lib64/vendor.google.whitechapel.audio.hal.audio.sound_dose.aoc.so vendor/lib64/vendor.google.whitechapel.audio.hal.effect.so diff --git a/caiman/proprietary-files.txt b/caiman/proprietary-files.txt index 8fc8ec4f..914fc67c 100644 --- a/caiman/proprietary-files.txt +++ b/caiman/proprietary-files.txt @@ -124,6 +124,10 @@ system_ext/etc/permissions/com.android.qns.xml system_ext/etc/permissions/com.shannon.imsservice.xml system_ext/etc/permissions/com.shannon.rcsservice.xml system_ext/lib64/libmediaadaptor.so +system_ext/lib64/libpixelimsmedia.so +system_ext/lib64/vendor.google.whitechapel.audio.audioext@4.0.so +system_ext/lib64/vendor.google.whitechapel.audio.extension-V2-ndk.so +system_ext/priv-app/PixelImsMediaService/PixelImsMediaService.apk system_ext/priv-app/PixelQualifiedNetworksService/PixelQualifiedNetworksService.apk system_ext/priv-app/ShannonIms/ShannonIms.apk;PRESIGNED system_ext/priv-app/ShannonRcs/ShannonRcs.apk;PRESIGNED diff --git a/caiman/setup-makefiles.sh b/caiman/setup-makefiles.sh index 7bfb4c5b..6a6700f3 100755 --- a/caiman/setup-makefiles.sh +++ b/caiman/setup-makefiles.sh @@ -41,7 +41,9 @@ function lib_to_package_fixup_vendor_variants() { case "$1" in com.google.edgetpu_app_service-V4-ndk | \ - com.google.edgetpu_vendor_service-V2-ndk) + com.google.edgetpu_vendor_service-V2-ndk | \ + vendor.google.whitechapel.audio.audioext@4.0 | \ + vendor.google.whitechapel.audio.extension-V2-ndk) echo "$1-vendor" ;; libprotobuf-cpp-full-21.12) diff --git a/komodo/extract-files.sh b/komodo/extract-files.sh index 5a4092b4..89774c32 100755 --- a/komodo/extract-files.sh +++ b/komodo/extract-files.sh @@ -116,6 +116,8 @@ if [ -z "${ONLY_FIRMWARE}" ]; then set_module_suffix "vendor/lib64/com.google.edgetpu_app_service-V4-ndk.so" "-vendor" "${VENDOR_TXT}" set_module_suffix "vendor/lib64/com.google.edgetpu_vendor_service-V2-ndk.so" "-vendor" "${VENDOR_TXT}" + set_module_suffix "vendor/lib64/vendor.google.whitechapel.audio.audioext@4.0.so" "-vendor" "${VENDOR_TXT}" + set_module_suffix "vendor/lib64/vendor.google.whitechapel.audio.extension-V2-ndk.so" "-vendor" "${VENDOR_TXT}" extract "${MY_DIR}/proprietary-files-vendor.txt" "${SRC}" "${KANG}" --section "${SECTION}" fi diff --git a/komodo/proprietary-files-vendor.txt b/komodo/proprietary-files-vendor.txt index dee028fd..f504c80e 100644 --- a/komodo/proprietary-files-vendor.txt +++ b/komodo/proprietary-files-vendor.txt @@ -2839,8 +2839,8 @@ vendor/lib64/vendor.google.battery_mitigation.service_static.so vendor/lib64/vendor.google.bluetooth_ext-V1-ndk.so vendor/lib64/vendor.google.google_battery-V3-ndk.so vendor/lib64/vendor.google.radio_ext-V1-ndk.so -vendor/lib64/vendor.google.whitechapel.audio.audioext@4.0.so -vendor/lib64/vendor.google.whitechapel.audio.extension-V2-ndk.so +vendor/lib64/vendor.google.whitechapel.audio.audioext@4.0.so;MODULE_SUFFIX=-vendor +vendor/lib64/vendor.google.whitechapel.audio.extension-V2-ndk.so;MODULE_SUFFIX=-vendor vendor/lib64/vendor.google.whitechapel.audio.hal.audio.so vendor/lib64/vendor.google.whitechapel.audio.hal.audio.sound_dose.aoc.so vendor/lib64/vendor.google.whitechapel.audio.hal.effect.so diff --git a/komodo/proprietary-files.txt b/komodo/proprietary-files.txt index f9de940c..6f6dc447 100644 --- a/komodo/proprietary-files.txt +++ b/komodo/proprietary-files.txt @@ -123,6 +123,10 @@ system_ext/etc/permissions/com.android.qns.xml system_ext/etc/permissions/com.shannon.imsservice.xml system_ext/etc/permissions/com.shannon.rcsservice.xml system_ext/lib64/libmediaadaptor.so +system_ext/lib64/libpixelimsmedia.so +system_ext/lib64/vendor.google.whitechapel.audio.audioext@4.0.so +system_ext/lib64/vendor.google.whitechapel.audio.extension-V2-ndk.so +system_ext/priv-app/PixelImsMediaService/PixelImsMediaService.apk system_ext/priv-app/PixelQualifiedNetworksService/PixelQualifiedNetworksService.apk system_ext/priv-app/ShannonIms/ShannonIms.apk;PRESIGNED system_ext/priv-app/ShannonRcs/ShannonRcs.apk;PRESIGNED diff --git a/komodo/setup-makefiles.sh b/komodo/setup-makefiles.sh index 3b30bfca..b2df449c 100755 --- a/komodo/setup-makefiles.sh +++ b/komodo/setup-makefiles.sh @@ -41,7 +41,9 @@ function lib_to_package_fixup_vendor_variants() { case "$1" in com.google.edgetpu_app_service-V4-ndk | \ - com.google.edgetpu_vendor_service-V2-ndk) + com.google.edgetpu_vendor_service-V2-ndk | \ + vendor.google.whitechapel.audio.audioext@4.0 | \ + vendor.google.whitechapel.audio.extension-V2-ndk) echo "$1-vendor" ;; libprotobuf-cpp-full-21.12) diff --git a/tokay/extract-files.sh b/tokay/extract-files.sh index 272b4c77..a95ee8be 100755 --- a/tokay/extract-files.sh +++ b/tokay/extract-files.sh @@ -116,6 +116,8 @@ if [ -z "${ONLY_FIRMWARE}" ]; then set_module_suffix "vendor/lib64/com.google.edgetpu_app_service-V4-ndk.so" "-vendor" "${VENDOR_TXT}" set_module_suffix "vendor/lib64/com.google.edgetpu_vendor_service-V2-ndk.so" "-vendor" "${VENDOR_TXT}" + set_module_suffix "vendor/lib64/vendor.google.whitechapel.audio.audioext@4.0.so" "-vendor" "${VENDOR_TXT}" + set_module_suffix "vendor/lib64/vendor.google.whitechapel.audio.extension-V2-ndk.so" "-vendor" "${VENDOR_TXT}" extract "${MY_DIR}/proprietary-files-vendor.txt" "${SRC}" "${KANG}" --section "${SECTION}" fi diff --git a/tokay/proprietary-files-vendor.txt b/tokay/proprietary-files-vendor.txt index bc6eb6a0..f1d6bd80 100644 --- a/tokay/proprietary-files-vendor.txt +++ b/tokay/proprietary-files-vendor.txt @@ -2830,8 +2830,8 @@ vendor/lib64/vendor.google.battery_mitigation.service_static.so vendor/lib64/vendor.google.bluetooth_ext-V1-ndk.so vendor/lib64/vendor.google.google_battery-V3-ndk.so vendor/lib64/vendor.google.radio_ext-V1-ndk.so -vendor/lib64/vendor.google.whitechapel.audio.audioext@4.0.so -vendor/lib64/vendor.google.whitechapel.audio.extension-V2-ndk.so +vendor/lib64/vendor.google.whitechapel.audio.audioext@4.0.so;MODULE_SUFFIX=-vendor +vendor/lib64/vendor.google.whitechapel.audio.extension-V2-ndk.so;MODULE_SUFFIX=-vendor vendor/lib64/vendor.google.whitechapel.audio.hal.audio.so vendor/lib64/vendor.google.whitechapel.audio.hal.audio.sound_dose.aoc.so vendor/lib64/vendor.google.whitechapel.audio.hal.effect.so diff --git a/tokay/proprietary-files.txt b/tokay/proprietary-files.txt index c7f15fcf..6f66d4a4 100644 --- a/tokay/proprietary-files.txt +++ b/tokay/proprietary-files.txt @@ -119,6 +119,10 @@ system_ext/etc/permissions/com.android.qns.xml system_ext/etc/permissions/com.shannon.imsservice.xml system_ext/etc/permissions/com.shannon.rcsservice.xml system_ext/lib64/libmediaadaptor.so +system_ext/lib64/libpixelimsmedia.so +system_ext/lib64/vendor.google.whitechapel.audio.audioext@4.0.so +system_ext/lib64/vendor.google.whitechapel.audio.extension-V2-ndk.so +system_ext/priv-app/PixelImsMediaService/PixelImsMediaService.apk system_ext/priv-app/PixelQualifiedNetworksService/PixelQualifiedNetworksService.apk system_ext/priv-app/ShannonIms/ShannonIms.apk;PRESIGNED system_ext/priv-app/ShannonRcs/ShannonRcs.apk;PRESIGNED diff --git a/tokay/setup-makefiles.sh b/tokay/setup-makefiles.sh index 265d65e5..3fef20db 100755 --- a/tokay/setup-makefiles.sh +++ b/tokay/setup-makefiles.sh @@ -41,7 +41,9 @@ function lib_to_package_fixup_vendor_variants() { case "$1" in com.google.edgetpu_app_service-V4-ndk | \ - com.google.edgetpu_vendor_service-V2-ndk) + com.google.edgetpu_vendor_service-V2-ndk | \ + vendor.google.whitechapel.audio.audioext@4.0 | \ + vendor.google.whitechapel.audio.extension-V2-ndk) echo "$1-vendor" ;; libprotobuf-cpp-full-21.12)