[automerger skipped] Merge Android 14 QPR3 to AOSP main am: 466eb98b3b -s ours am: 90161513df -s ours

am skip reason: Merged-In I09bad11f771436cff15e6ea9fa12b7881801bbfb with SHA-1 80f8771166 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/ImsMedia/+/3131489

Change-Id: Ieda20c24ee1ac888f1dcf6d3fa28d0d179e5d1ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

service/src/com/android/telephony/imsmedia/lib/libimsmedia/Android.bp

diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/Android.bp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/Android.bp
index 903f469..80eed2f 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/Android.bp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/Android.bp
@@ -18,40 +18,6 @@
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
-soong_config_module_type {
-    name: "audio_cc_defaults",
-    module_type: "cc_defaults",
-    config_namespace: "audio_lib",
-    variables: ["audio_type"],
-    properties: ["defaults","static_libs","header_libs"],
-}
-
-soong_config_string_variable {
-    name: "audio_type",
-    values: ["oem_audio"],
-}
-
-audio_cc_defaults {
-    name: "libimsmedia_audio_cc_defaults",
-    soong_config_variables: {
-        audio_type: {
-            oem_audio: {
-                defaults: [
-                    "libimsmedia_oem_audio_codec_defaults",
-                ],
-                static_libs: [
-                    "libimsmedia_oem_audio_codec",
-                ],
-            },
-            conditions_default: {
-                static_libs: [
-                    "libimsmedia_aosp_audio_codec",
-                ],
-            },
-        },
-    },
-}
-
 cc_defaults {
     name: "libimsmedia_defaults",
     cflags: [
@@ -70,13 +36,13 @@
     name: "libimsmedia",
     system_ext_specific: true,
     defaults: [
-        "libimsmedia_audio_cc_defaults",
         "libimsmedia_defaults",
     ],
     srcs: [
         "libimsmedia.cpp",
     ],
     static_libs: [
+        "libimsmedia_audio",
         "libimsmedia_config",
         "libimsmedia_core",
         "libimsmedia_protocol",

service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/Android.bp

diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/Android.bp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/Android.bp
index eee19e6..f173bd1 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/Android.bp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/Android.bp
@@ -18,30 +18,6 @@
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
-soong_config_module_type_import {
-    from: "packages/modules/ImsMedia/service/src/com/android/telephony/imsmedia/lib/libimsmedia/Android.bp",
-    module_types: ["audio_cc_defaults"],
-}
-
-audio_cc_defaults {
-    name: "libimsmedia_audio_header_cc_defaults",
-    soong_config_variables: {
-        audio_type: {
-            oem_audio: {
-                header_libs: [
-                    "libimsmedia_oem_audio_codec_headers",
-                ],
-            },
-            conditions_default: {
-                header_libs: [
-                    "libimsmedia_aosp_audio_codec_headers",
-                ],
-            },
-        },
-    },
-}
-
-
 cc_library_headers {
     name: "libimsmedia_headers",
     export_include_dirs: [
@@ -147,11 +123,10 @@
         "libimsmedia_audio_defaults",
         "libimsmedia_video_defaults",
         "libimsmedia_text_defaults",
-        "libimsmedia_audio_header_cc_defaults",
     ],
     srcs: [
         "**/*.cpp",
-        ":libimsmedia_jni_srcs"
+        ":libimsmedia_jni_srcs",
     ],
     exclude_srcs: [
         "audio/android/*.cpp",
@@ -163,6 +138,7 @@
         "frameworks/av/media/utils/include",
     ],
     header_libs: [
+        "libimsmedia_android_audio_headers",
         "libimsmedia_jni_headers",
         "libimsmedia_protocol_interface_headers",
     ],

service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/android/Android.bp

diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/android/Android.bp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/android/Android.bp
index f5446b1..252ca0e 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/android/Android.bp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/android/Android.bp
@@ -19,14 +19,14 @@
 }
 
 cc_library_headers {
-    name: "libimsmedia_aosp_audio_codec_headers",
+    name: "libimsmedia_android_audio_headers",
     export_include_dirs: [
         "include",
     ],
 }
 
 cc_library_static {
-    name: "libimsmedia_aosp_audio_codec",
+    name: "libimsmedia_audio",
     defaults: [
         "libimsmedia_defaults",
         "libimsmedia_audio_defaults",