caimito: Move libspeechenhancer to vendor

Change-Id: I7b254dd9ecc64e5535011a9014ac541ab83e788f
This commit is contained in:
Michael Bestas 2025-06-17 00:13:56 +03:00 committed by Michael Bestas
parent 491bd9b2fd
commit 7579278c56
No known key found for this signature in database
18 changed files with 21 additions and 141 deletions

View file

@ -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",
],
}

View file

@ -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",
],
}

View file

@ -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",
],
}

View file

@ -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 = {

View file

@ -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

View file

@ -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

View file

@ -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 += \

View file

@ -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 += \

View file

@ -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 += \

View file

@ -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 = {

View file

@ -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

View file

@ -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

View file

@ -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 = {

View file

@ -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

View file

@ -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