Revert "Revert "Move libmediahelper into a new folder.""

This reverts commit a0877dc731.

Reason for revert: Should work with go/pag/1465463 merging to master.

Change-Id: I17217744eacabf15621d4a5aac9dd1678e37e4ba

media/libaudiofoundation/Android.bp

@@ -4,13 +4,11 @@ cc_library_headers {
     export_include_dirs: ["include"],
     header_libs: [
         "libaudio_system_headers",
-        "libaudioclient_headers",
-        "libmedia_headers",
+        "libmedia_helper_headers",
     ],
     export_header_lib_headers: [
         "libaudio_system_headers",
-        "libaudioclient_headers",
-        "libmedia_headers",
+        "libmedia_helper_headers",
     ],
 }
 

media/libmedia/Android.bp

@@ -15,37 +15,6 @@ cc_library_headers {
     ],
 }
 
-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: [

media/libmediahelper/Android.bp

@@ -0,0 +1,29 @@
+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,
+}

media/libstagefright/Android.bp

@@ -102,6 +102,10 @@ cc_library_static {
         "include",
     ],
 
+    header_libs: [
+        "libmedia_helper_headers",
+    ],
+
     cflags: [
         "-Wno-multichar",
         "-Werror",

services/audioflinger/Android.bp

@@ -60,6 +60,10 @@ cc_library_shared {
         "libsndfile",
     ],
 
+    header_libs: [
+        "libmedia_headers",
+    ],
+
     cflags: [
         "-DSTATE_QUEUE_INSTANTIATIONS=\"StateQueueInstantiations.cpp\"",
         "-fvisibility=hidden",