Revert "Move libmediahelper into a new folder."
This reverts commit c8888660b53647ef1a9608493ab1a5dc93ba9b0d.
Reason for revert: Broke elfin build
Change-Id: Idfd67b064b28abf32da332149bdce212249345d8
diff --git a/media/libmedia/Android.bp b/media/libmedia/Android.bp
index 67043db..ba25512 100644
--- a/media/libmedia/Android.bp
+++ b/media/libmedia/Android.bp
@@ -15,6 +15,37 @@
],
}
+cc_library {
+ name: "libmedia_helper",
+ vendor_available: true,
+ vndk: {
+ enabled: true,
+ },
+ double_loadable: true,
+ srcs: [
+ "AudioParameter.cpp",
+ "TypeConverter.cpp",
+ ],
+ cflags: [
+ "-Werror",
+ "-Wno-error=deprecated-declarations",
+ "-Wall",
+ ],
+ shared_libs: [
+ "libutils",
+ "liblog",
+ ],
+ header_libs: [
+ "libmedia_headers",
+ "libaudioclient_headers",
+ "libaudio_system_headers",
+ ],
+ export_header_lib_headers: [
+ "libmedia_headers",
+ ],
+ clang: true,
+}
+
filegroup {
name: "libmedia_omx_aidl",
srcs: [