Break-up libaudioclient_aidl_conversion
To reduce transitive dependencies, we break out the generic parts of
libaudioclient_aidl_conversion to libaudioclient_aidl_conversion_util,
so that libaudiofoundtaion_headers could have a reduced number of
transitive dependencies (it is used in different partitions, so these
dependencies become a problem).
Test: m checkbuild
Change-Id: I1c9f385698dbc32405cc4878cd74d13e42ebb103
diff --git a/media/libaudioclient/Android.bp b/media/libaudioclient/Android.bp
index f6aa867..299df96 100644
--- a/media/libaudioclient/Android.bp
+++ b/media/libaudioclient/Android.bp
@@ -153,6 +153,31 @@
},
}
+// This is intended for clients needing to include AidlConversionUtil.h, without dragging in a lot of extra
+// dependencies.
+cc_library_headers {
+ name: "libaudioclient_aidl_conversion_util",
+ host_supported: true,
+ vendor_available: true,
+ double_loadable: true,
+ min_sdk_version: "29",
+ export_include_dirs: [
+ "include",
+ ],
+ header_libs: [
+ "libbase_headers",
+ ],
+ export_header_lib_headers: [
+ "libbase_headers",
+ ],
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.bluetooth.updatable",
+ "com.android.media",
+ "com.android.media.swcodec",
+ ],
+}
+
cc_library {
name: "libaudioclient_aidl_conversion",
srcs: ["AidlConversion.cpp"],
@@ -162,8 +187,12 @@
double_loadable: true,
min_sdk_version: "29",
header_libs: [
+ "libaudioclient_aidl_conversion_util",
"libaudio_system_headers",
],
+ export_header_lib_headers: [
+ "libaudioclient_aidl_conversion_util",
+ ],
shared_libs: [
"audioclient-types-aidl-unstable-cpp",
"libbase",
@@ -189,12 +218,6 @@
"signed-integer-overflow",
],
},
- apex_available: [
- "//apex_available:platform",
- "com.android.bluetooth.updatable",
- "com.android.media",
- "com.android.media.swcodec",
- ],
}
// AIDL interface between libaudioclient and framework.jar