diff --git a/audio/comet/prebuilt/libspeechenhancer/Android.bp b/audio/comet/prebuilt/libspeechenhancer/Android.bp deleted file mode 100644 index 9d4a232..0000000 --- a/audio/comet/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/comet/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so b/audio/comet/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so deleted file mode 100644 index 861ef15..0000000 Binary files a/audio/comet/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so and /dev/null differ diff --git a/comet/extract-files.py b/comet/extract-files.py index fd5f623..3e036fb 100755 --- a/comet/extract-files.py +++ b/comet/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/comet/proprietary-files-vendor.txt b/comet/proprietary-files-vendor.txt index 86e1630..c693391 100644 --- a/comet/proprietary-files-vendor.txt +++ b/comet/proprietary-files-vendor.txt @@ -3052,6 +3052,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/comet/skip-files-vendor.txt b/comet/skip-files-vendor.txt index 1330e59..a3e46cb 100644 --- a/comet/skip-files-vendor.txt +++ b/comet/skip-files-vendor.txt @@ -730,7 +730,6 @@ lib64/libregex.dylib.so lib64/libregex_syntax.dylib.so lib64/libril.so lib64/librilutils.so -lib64/libspeechenhancer.so lib64/libspeexresampler.so lib64/libssl.so lib64/libstagefright_foundation.so diff --git a/device-comet.mk b/device-comet.mk index 2354f09..6645706 100644 --- a/device-comet.mk +++ b/device-comet.mk @@ -302,11 +302,8 @@ PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.audio.cca.enabled=false # HdMic Audio -PRODUCT_SOONG_NAMESPACES += device/google/comet/audio/comet/prebuilt/libspeechenhancer PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.app.audio.gsenet.version=1 -PRODUCT_PACKAGES += \ - libspeechenhancer # Keymaster HAL #LOCAL_KEYMASTER_PRODUCT_PACKAGE ?= android.hardware.keymaster@4.1-service