tangorpro: Move libspeechenhancer to vendor

Change-Id: I7b254dd9ecc64e5535011a9014ac541ab83e788f

audio/tangorpro/prebuilt/libspeechenhancer/Android.bp

@@ -1,46 +0,0 @@
-// Copyright (C) 2023 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: {
-        arm: {
-            srcs: ["arm32/libspeechenhancer.so"],
-        },
-        arm64: {
-            srcs: ["arm64/libspeechenhancer.so"],
-        },
-    },
-
-    shared_libs: [
-        "libbinder_ndk",
-        "libcutils",
-        "libEGL",
-        "libGLESv2",
-        "liblog",
-        "libnativewindow",
-        "libsync",
-        "libz"
-    ],
-}

device-tangorpro.mk

@@ -312,14 +312,11 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_PACKAGES += \
     audio_apmg3_aoc
 
-PRODUCT_SOONG_NAMESPACES += device/google/tangorpro/audio/tangorpro/prebuilt/libspeechenhancer
-
 #Audio
 PRODUCT_PROPERTY_OVERRIDES += \
     persist.vendor.audio.speech_enhancement.enable=1
 
 PRODUCT_PACKAGES += \
-    libspeechenhancer \
     audio_speech_enhancer_aoc
 
 # SKU specific RROs

tangorpro/extract-files.py

@@ -50,6 +50,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/lib/libspeechenhancer.so', '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 = {

tangorpro/proprietary-files-vendor.txt

@@ -259,6 +259,7 @@ vendor/lib/libmahalcontroller.so
 vendor/lib/libmetrics_logger.so
 vendor/lib/libqorvo_uwb_params_nfcc.so
 vendor/lib/libsensorsuez.so
+vendor/lib/libspeechenhancer.so
 vendor/lib/libstreset21.so
 vendor/lib/libsueznanoappclients.so
 vendor/lib/libusf.so
@@ -383,6 +384,7 @@ vendor/lib64/libsensorsuez.so
 vendor/lib64/libsit_oem.so
 vendor/lib64/libsit_oem_proto.so
 vendor/lib64/libspeech_waveformaec_runner.so
+vendor/lib64/libspeechenhancer.so
 vendor/lib64/libstreset21.so
 vendor/lib64/libsueznanoappclients.so
 vendor/lib64/libtachyon_core.so

tangorpro/skip-files-vendor.txt

@@ -648,7 +648,6 @@ lib/libprotobuf-cpp-lite-21.12.so
 lib/libreference-ril.so
 lib/libril.so
 lib/librilutils.so
-lib/libspeechenhancer.so
 lib/libspeexresampler.so
 lib/libstagefright_foundation.so
 lib/libtinyalsa.so
@@ -1141,7 +1140,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