From f115c228d7c7771edc307b933ae1abd0df8ba29f Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Sat, 26 Oct 2024 00:46:17 +0300 Subject: [PATCH] shusky: Add PixelImsMediaService Change-Id: I2bf94759e28bea4ca8afe4d79bc5c6328f84e51d --- husky/extract-files.sh | 2 ++ husky/proprietary-files-vendor.txt | 4 ++-- husky/proprietary-files.txt | 4 ++++ husky/setup-makefiles.sh | 4 +++- shiba/extract-files.sh | 2 ++ shiba/proprietary-files-vendor.txt | 4 ++-- shiba/proprietary-files.txt | 4 ++++ shiba/setup-makefiles.sh | 4 +++- 8 files changed, 22 insertions(+), 6 deletions(-) diff --git a/husky/extract-files.sh b/husky/extract-files.sh index c32c608..577895d 100755 --- a/husky/extract-files.sh +++ b/husky/extract-files.sh @@ -119,6 +119,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/husky/proprietary-files-vendor.txt b/husky/proprietary-files-vendor.txt index f3eede1..02eb6bb 100644 --- a/husky/proprietary-files-vendor.txt +++ b/husky/proprietary-files-vendor.txt @@ -1647,8 +1647,8 @@ vendor/lib64/vendor.google.battery_mitigation-V1-ndk.so 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.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.wireless_charger-V2-ndk.so vendor/lib64/vendor.google.wireless_charger.service-V1-ndk.so vendor/lib64/vendor.radio.base.so diff --git a/husky/proprietary-files.txt b/husky/proprietary-files.txt index b8e75ee..f17c8b0 100644 --- a/husky/proprietary-files.txt +++ b/husky/proprietary-files.txt @@ -114,6 +114,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/husky/setup-makefiles.sh b/husky/setup-makefiles.sh index 0ca47b0..79130ba 100755 --- a/husky/setup-makefiles.sh +++ b/husky/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/shiba/extract-files.sh b/shiba/extract-files.sh index 42e3535..4ed783c 100755 --- a/shiba/extract-files.sh +++ b/shiba/extract-files.sh @@ -119,6 +119,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/shiba/proprietary-files-vendor.txt b/shiba/proprietary-files-vendor.txt index dc45cc4..4190387 100644 --- a/shiba/proprietary-files-vendor.txt +++ b/shiba/proprietary-files-vendor.txt @@ -1644,8 +1644,8 @@ vendor/lib64/vendor.google.battery_mitigation-V1-ndk.so 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.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.wireless_charger-V2-ndk.so vendor/lib64/vendor.google.wireless_charger.service-V1-ndk.so vendor/lib64/vendor.radio.base.so diff --git a/shiba/proprietary-files.txt b/shiba/proprietary-files.txt index 0e438b5..6a1c1cd 100644 --- a/shiba/proprietary-files.txt +++ b/shiba/proprietary-files.txt @@ -110,6 +110,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/shiba/setup-makefiles.sh b/shiba/setup-makefiles.sh index b0265cb..9496aeb 100755 --- a/shiba/setup-makefiles.sh +++ b/shiba/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)