diff --git a/audio/husky/prebuilt/libspeechenhancer/Android.bp b/audio/husky/prebuilt/libspeechenhancer/Android.bp deleted file mode 100644 index 9d4a232..0000000 --- a/audio/husky/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/husky/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so b/audio/husky/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so deleted file mode 100644 index 861ef15..0000000 Binary files a/audio/husky/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so and /dev/null differ diff --git a/audio/shiba/prebuilt/libspeechenhancer/Android.bp b/audio/shiba/prebuilt/libspeechenhancer/Android.bp deleted file mode 100644 index 9d4a232..0000000 --- a/audio/shiba/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/shiba/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so b/audio/shiba/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so deleted file mode 100644 index 861ef15..0000000 Binary files a/audio/shiba/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so and /dev/null differ diff --git a/device-husky.mk b/device-husky.mk index 2f064b2..5a30f7e 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -163,11 +163,8 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.audio.spatializer_enabled=true # HdMic Audio -PRODUCT_SOONG_NAMESPACES += device/google/shusky/audio/husky/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-shiba.mk b/device-shiba.mk index e08e7a1..771ad22 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -151,11 +151,8 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.audio.spatializer_enabled=true # HdMic Audio -PRODUCT_SOONG_NAMESPACES += device/google/shusky/audio/shiba/prebuilt/libspeechenhancer PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.app.audio.gsenet.version=1 -PRODUCT_PACKAGES += \ - libspeechenhancer # Audio CCA property PRODUCT_PROPERTY_OVERRIDES += \ diff --git a/husky/extract-files.py b/husky/extract-files.py index 5495037..f21371c 100755 --- a/husky/extract-files.py +++ b/husky/extract-files.py @@ -54,6 +54,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/husky/proprietary-files-vendor.txt b/husky/proprietary-files-vendor.txt index 5348f5a..f8585a6 100644 --- a/husky/proprietary-files-vendor.txt +++ b/husky/proprietary-files-vendor.txt @@ -1946,6 +1946,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/libstpreprocess21.so vendor/lib64/libstreset23.so vendor/lib64/libsueznanoappclients.so diff --git a/husky/skip-files-vendor.txt b/husky/skip-files-vendor.txt index 536acc0..6943b2c 100644 --- a/husky/skip-files-vendor.txt +++ b/husky/skip-files-vendor.txt @@ -705,7 +705,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/shiba/extract-files.py b/shiba/extract-files.py index 72fed27..3055fda 100755 --- a/shiba/extract-files.py +++ b/shiba/extract-files.py @@ -54,6 +54,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/shiba/proprietary-files-vendor.txt b/shiba/proprietary-files-vendor.txt index 6f93fda..5142389 100644 --- a/shiba/proprietary-files-vendor.txt +++ b/shiba/proprietary-files-vendor.txt @@ -1943,6 +1943,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/libstpreprocess21.so vendor/lib64/libstreset23.so vendor/lib64/libsueznanoappclients.so diff --git a/shiba/skip-files-vendor.txt b/shiba/skip-files-vendor.txt index ec3c37a..d75857a 100644 --- a/shiba/skip-files-vendor.txt +++ b/shiba/skip-files-vendor.txt @@ -701,7 +701,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