diff --git a/audio/caiman/prebuilt/libspeechenhancer/Android.bp b/audio/caiman/prebuilt/libspeechenhancer/Android.bp deleted file mode 100644 index 9d4a2327..00000000 --- a/audio/caiman/prebuilt/libspeechenhancer/Android.bp +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright (C) 2024 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -soong_namespace { -} - -package { - default_applicable_licenses: ["Android-Apache-2.0"], -} - -cc_prebuilt_library_shared { - name: "libspeechenhancer", - vendor: true, - owner: "google", - proprietary: true, - allow_undefined_symbols: true, - arch: { - arm64: { - srcs: ["arm64/libspeechenhancer.so"], - }, - }, - - shared_libs: [ - "libcutils", - "libEGL", - "libGLESv2", - "libbinder_ndk", - "liblog", - "libsync", - "libz", - "libnativewindow", - ], -} diff --git a/audio/caiman/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so b/audio/caiman/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so deleted file mode 100644 index 861ef15a..00000000 Binary files a/audio/caiman/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so and /dev/null differ diff --git a/audio/komodo/prebuilt/libspeechenhancer/Android.bp b/audio/komodo/prebuilt/libspeechenhancer/Android.bp deleted file mode 100644 index 9d4a2327..00000000 --- a/audio/komodo/prebuilt/libspeechenhancer/Android.bp +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright (C) 2024 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -soong_namespace { -} - -package { - default_applicable_licenses: ["Android-Apache-2.0"], -} - -cc_prebuilt_library_shared { - name: "libspeechenhancer", - vendor: true, - owner: "google", - proprietary: true, - allow_undefined_symbols: true, - arch: { - arm64: { - srcs: ["arm64/libspeechenhancer.so"], - }, - }, - - shared_libs: [ - "libcutils", - "libEGL", - "libGLESv2", - "libbinder_ndk", - "liblog", - "libsync", - "libz", - "libnativewindow", - ], -} diff --git a/audio/komodo/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so b/audio/komodo/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so deleted file mode 100644 index 861ef15a..00000000 Binary files a/audio/komodo/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so and /dev/null differ diff --git a/audio/tokay/prebuilt/libspeechenhancer/Android.bp b/audio/tokay/prebuilt/libspeechenhancer/Android.bp deleted file mode 100644 index 9d4a2327..00000000 --- a/audio/tokay/prebuilt/libspeechenhancer/Android.bp +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright (C) 2024 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -soong_namespace { -} - -package { - default_applicable_licenses: ["Android-Apache-2.0"], -} - -cc_prebuilt_library_shared { - name: "libspeechenhancer", - vendor: true, - owner: "google", - proprietary: true, - allow_undefined_symbols: true, - arch: { - arm64: { - srcs: ["arm64/libspeechenhancer.so"], - }, - }, - - shared_libs: [ - "libcutils", - "libEGL", - "libGLESv2", - "libbinder_ndk", - "liblog", - "libsync", - "libz", - "libnativewindow", - ], -} diff --git a/audio/tokay/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so b/audio/tokay/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so deleted file mode 100644 index 861ef15a..00000000 Binary files a/audio/tokay/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so and /dev/null differ diff --git a/caiman/extract-files.py b/caiman/extract-files.py index da6196e3..119be147 100755 --- a/caiman/extract-files.py +++ b/caiman/extract-files.py @@ -52,6 +52,12 @@ blob_fixups: blob_fixups_user_type = { .patch_file('osaifu-keitai.patch'), 'vendor/etc/init/init.modem_logging_control.rc': blob_fixup() .regex_replace(' && property:ro.debuggable=0', ''), + 'vendor/lib64/libspeechenhancer.so': blob_fixup() + .clear_symbol_version('AHardwareBuffer_allocate') + .clear_symbol_version('AHardwareBuffer_describe') + .clear_symbol_version('AHardwareBuffer_lock') + .clear_symbol_version('AHardwareBuffer_release') + .clear_symbol_version('AHardwareBuffer_unlock'), } # fmt: skip extract_fns: extract_fns_user_type = { diff --git a/caiman/proprietary-files-vendor.txt b/caiman/proprietary-files-vendor.txt index 254d7d8e..4e7159a1 100644 --- a/caiman/proprietary-files-vendor.txt +++ b/caiman/proprietary-files-vendor.txt @@ -3034,6 +3034,7 @@ vendor/lib64/libsitril-client.so vendor/lib64/libsitril-gps.so vendor/lib64/libsitril-ims.so vendor/lib64/libsitril.so +vendor/lib64/libspeechenhancer.so vendor/lib64/libstreset24.so vendor/lib64/libsueznanoappclients.so vendor/lib64/libtachyon_core.so diff --git a/caiman/skip-files-vendor.txt b/caiman/skip-files-vendor.txt index 639689a8..ce109e9b 100644 --- a/caiman/skip-files-vendor.txt +++ b/caiman/skip-files-vendor.txt @@ -722,7 +722,6 @@ lib64/libregex_syntax.dylib.so lib64/libril.so lib64/librilutils.so lib64/libsparse.so -lib64/libspeechenhancer.so lib64/libspeexresampler.so lib64/libssl.so lib64/libstagefright_foundation.so diff --git a/device-caiman.mk b/device-caiman.mk index 394a6c17..dd2ef1cf 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -201,11 +201,8 @@ PRODUCT_PACKAGES += \ endif # HdMic Audio -PRODUCT_SOONG_NAMESPACES += device/google/caimito/audio/caiman/prebuilt/libspeechenhancer PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.app.audio.gsenet.version=1 -PRODUCT_PACKAGES += \ - libspeechenhancer # Audio CCA property PRODUCT_PROPERTY_OVERRIDES += \ diff --git a/device-komodo.mk b/device-komodo.mk index 153c23b6..bff0f0c7 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -221,11 +221,8 @@ PRODUCT_PACKAGES += \ endif # HdMic Audio -PRODUCT_SOONG_NAMESPACES += device/google/caimito/audio/komodo/prebuilt/libspeechenhancer PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.app.audio.gsenet.version=1 -PRODUCT_PACKAGES += \ - libspeechenhancer # Audio CCA property PRODUCT_PROPERTY_OVERRIDES += \ diff --git a/device-tokay.mk b/device-tokay.mk index 3c4b6561..8831196c 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -194,11 +194,8 @@ PRODUCT_PACKAGES += \ endif # HdMic Audio -PRODUCT_SOONG_NAMESPACES += device/google/caimito/audio/tokay/prebuilt/libspeechenhancer PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.app.audio.gsenet.version=1 -PRODUCT_PACKAGES += \ - libspeechenhancer # Audio CCA property PRODUCT_PROPERTY_OVERRIDES += \ diff --git a/komodo/extract-files.py b/komodo/extract-files.py index cb5d717a..5ee8fbb4 100755 --- a/komodo/extract-files.py +++ b/komodo/extract-files.py @@ -52,6 +52,12 @@ blob_fixups: blob_fixups_user_type = { .patch_file('osaifu-keitai.patch'), 'vendor/etc/init/init.modem_logging_control.rc': blob_fixup() .regex_replace(' && property:ro.debuggable=0', ''), + 'vendor/lib64/libspeechenhancer.so': blob_fixup() + .clear_symbol_version('AHardwareBuffer_allocate') + .clear_symbol_version('AHardwareBuffer_describe') + .clear_symbol_version('AHardwareBuffer_lock') + .clear_symbol_version('AHardwareBuffer_release') + .clear_symbol_version('AHardwareBuffer_unlock'), } # fmt: skip extract_fns: extract_fns_user_type = { diff --git a/komodo/proprietary-files-vendor.txt b/komodo/proprietary-files-vendor.txt index ec10811f..afc98c23 100644 --- a/komodo/proprietary-files-vendor.txt +++ b/komodo/proprietary-files-vendor.txt @@ -3032,6 +3032,7 @@ vendor/lib64/libsitril-client.so vendor/lib64/libsitril-gps.so vendor/lib64/libsitril-ims.so vendor/lib64/libsitril.so +vendor/lib64/libspeechenhancer.so vendor/lib64/libstreset24.so vendor/lib64/libsueznanoappclients.so vendor/lib64/libtachyon_core.so diff --git a/komodo/skip-files-vendor.txt b/komodo/skip-files-vendor.txt index cff1c21b..b7826715 100644 --- a/komodo/skip-files-vendor.txt +++ b/komodo/skip-files-vendor.txt @@ -723,7 +723,6 @@ lib64/libregex_syntax.dylib.so lib64/libril.so lib64/librilutils.so lib64/libsparse.so -lib64/libspeechenhancer.so lib64/libspeexresampler.so lib64/libssl.so lib64/libstagefright_foundation.so diff --git a/tokay/extract-files.py b/tokay/extract-files.py index d0e42be1..4594709d 100755 --- a/tokay/extract-files.py +++ b/tokay/extract-files.py @@ -52,6 +52,12 @@ blob_fixups: blob_fixups_user_type = { .patch_file('osaifu-keitai.patch'), 'vendor/etc/init/init.modem_logging_control.rc': blob_fixup() .regex_replace(' && property:ro.debuggable=0', ''), + 'vendor/lib64/libspeechenhancer.so': blob_fixup() + .clear_symbol_version('AHardwareBuffer_allocate') + .clear_symbol_version('AHardwareBuffer_describe') + .clear_symbol_version('AHardwareBuffer_lock') + .clear_symbol_version('AHardwareBuffer_release') + .clear_symbol_version('AHardwareBuffer_unlock'), } # fmt: skip extract_fns: extract_fns_user_type = { diff --git a/tokay/proprietary-files-vendor.txt b/tokay/proprietary-files-vendor.txt index 7188b49c..f1a7af2e 100644 --- a/tokay/proprietary-files-vendor.txt +++ b/tokay/proprietary-files-vendor.txt @@ -3023,6 +3023,7 @@ vendor/lib64/libsitril-client.so vendor/lib64/libsitril-gps.so vendor/lib64/libsitril-ims.so vendor/lib64/libsitril.so +vendor/lib64/libspeechenhancer.so vendor/lib64/libstreset24.so vendor/lib64/libsueznanoappclients.so vendor/lib64/libtachyon_core.so diff --git a/tokay/skip-files-vendor.txt b/tokay/skip-files-vendor.txt index 9101e39b..41912020 100644 --- a/tokay/skip-files-vendor.txt +++ b/tokay/skip-files-vendor.txt @@ -713,7 +713,6 @@ lib64/libregex_syntax.dylib.so lib64/libril.so lib64/librilutils.so lib64/libsparse.so -lib64/libspeechenhancer.so lib64/libspeexresampler.so lib64/libssl.so lib64/libstagefright_foundation.so