Merge "caimito: Add libspeechenhancer to P24" into main

audio/caiman/prebuilt/libspeechenhancer/Android.bp

@@ -0,0 +1,41 @@
+// 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",
+        "liblog",
+        "libz",
+        "libnativewindow",
+    ],
+}

audio/komodo/prebuilt/libspeechenhancer/Android.bp

@@ -0,0 +1,41 @@
+// 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",
+        "liblog",
+        "libz",
+        "libnativewindow",
+    ],
+}

audio/tokay/prebuilt/libspeechenhancer/Android.bp

@@ -0,0 +1,41 @@
+// 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",
+        "liblog",
+        "libz",
+        "libnativewindow",
+    ],
+}

device-caiman.mk

@@ -159,6 +159,13 @@ PRODUCT_PACKAGES += \
 	audio_sounddose_aoc
 endif
 
+# HdMic Audio
+PRODUCT_SOONG_NAMESPACES += device/google/caimito/audio/caiman/prebuilt/libspeechenhancer
+PRODUCT_PROPERTY_OVERRIDES += \
+    persist.vendor.audio.hdmic.version=1
+PRODUCT_PACKAGES += \
+    libspeechenhancer
+
 # Audio CCA property
 PRODUCT_PROPERTY_OVERRIDES += \
 	persist.vendor.audio.cca.enabled=false

device-komodo.mk

@@ -182,6 +182,13 @@ PRODUCT_PACKAGES += \
 	audio_sounddose_aoc
 endif
 
+# HdMic Audio
+PRODUCT_SOONG_NAMESPACES += device/google/caimito/audio/komodo/prebuilt/libspeechenhancer
+PRODUCT_PROPERTY_OVERRIDES += \
+    persist.vendor.audio.hdmic.version=1
+PRODUCT_PACKAGES += \
+    libspeechenhancer
+
 # Audio CCA property
 PRODUCT_PROPERTY_OVERRIDES += \
 	persist.vendor.audio.cca.enabled=false

device-tokay.mk

@@ -152,6 +152,13 @@ PRODUCT_PACKAGES += \
 	audio_sounddose_aoc
 endif
 
+# HdMic Audio
+PRODUCT_SOONG_NAMESPACES += device/google/caimito/audio/tokay/prebuilt/libspeechenhancer
+PRODUCT_PROPERTY_OVERRIDES += \
+    persist.vendor.audio.hdmic.version=1
+PRODUCT_PACKAGES += \
+    libspeechenhancer
+
 # Audio CCA property
 PRODUCT_PROPERTY_OVERRIDES += \
 	persist.vendor.audio.cca.enabled=false