Revert "Move libmediahelper into a new folder."
This reverts commit c8888660b53647ef1a9608493ab1a5dc93ba9b0d.
Reason for revert: Broke elfin build
Change-Id: Idfd67b064b28abf32da332149bdce212249345d8
diff --git a/media/libmediahelper/include/media/AudioParameter.h b/media/libaudioclient/include/media/AudioParameter.h
similarity index 100%
rename from media/libmediahelper/include/media/AudioParameter.h
rename to media/libaudioclient/include/media/AudioParameter.h
diff --git a/media/libaudiofoundation/Android.bp b/media/libaudiofoundation/Android.bp
index 1df0d16..e830e56 100644
--- a/media/libaudiofoundation/Android.bp
+++ b/media/libaudiofoundation/Android.bp
@@ -4,11 +4,13 @@
export_include_dirs: ["include"],
header_libs: [
"libaudio_system_headers",
- "libmedia_helper_headers",
+ "libaudioclient_headers",
+ "libmedia_headers",
],
export_header_lib_headers: [
"libaudio_system_headers",
- "libmedia_helper_headers",
+ "libaudioclient_headers",
+ "libmedia_headers",
],
}
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: [
diff --git a/media/libmediahelper/AudioParameter.cpp b/media/libmedia/AudioParameter.cpp
similarity index 100%
rename from media/libmediahelper/AudioParameter.cpp
rename to media/libmedia/AudioParameter.cpp
diff --git a/media/libmediahelper/TypeConverter.cpp b/media/libmedia/TypeConverter.cpp
similarity index 100%
rename from media/libmediahelper/TypeConverter.cpp
rename to media/libmedia/TypeConverter.cpp
diff --git a/media/libmediahelper/include/media/TypeConverter.h b/media/libmedia/include/media/TypeConverter.h
similarity index 100%
rename from media/libmediahelper/include/media/TypeConverter.h
rename to media/libmedia/include/media/TypeConverter.h
diff --git a/media/libmediahelper/include/media/convert.h b/media/libmedia/include/media/convert.h
similarity index 100%
rename from media/libmediahelper/include/media/convert.h
rename to media/libmedia/include/media/convert.h
diff --git a/media/libmediahelper/Android.bp b/media/libmediahelper/Android.bp
deleted file mode 100644
index 72edeec..0000000
--- a/media/libmediahelper/Android.bp
+++ /dev/null
@@ -1,29 +0,0 @@
-cc_library_headers {
- name: "libmedia_helper_headers",
- vendor_available: true,
- export_include_dirs: ["include"],
-}
-
-cc_library {
- name: "libmedia_helper",
- vendor_available: true,
- vndk: {
- enabled: true,
- },
- double_loadable: true,
- srcs: ["AudioParameter.cpp", "TypeConverter.cpp"],
- cflags: [
- "-Werror",
- "-Wextra",
- "-Wall",
- ],
- shared_libs: ["libutils", "liblog"],
- header_libs: [
- "libmedia_helper_headers",
- "libaudio_system_headers",
- ],
- export_header_lib_headers: [
- "libmedia_helper_headers",
- ],
- clang: true,
-}
diff --git a/media/libstagefright/Android.bp b/media/libstagefright/Android.bp
index 38921e2..806e277 100644
--- a/media/libstagefright/Android.bp
+++ b/media/libstagefright/Android.bp
@@ -102,10 +102,6 @@
"include",
],
- header_libs: [
- "libmedia_helper_headers",
- ],
-
cflags: [
"-Wno-multichar",
"-Werror",