commit 07be14fb96fc5c106ea2b874faf2b768f468eb8e
author Kevin Rocard <krocard@google.com> Wed Jan 24 06:14:03 2018 +0000
committer Kevin Rocard <krocard@google.com> Wed Jan 24 06:14:03 2018 +0000
tree 01cd8f75542d7581505bef8a5b9e2f09790ac0e1
parent f8ad7f85e9891b2614338330c75ae9e946fccc5a

Revert "Audio V4: Split system and vendor Audio.h"

This reverts commit f8ad7f85e9891b2614338330c75ae9e946fccc5a.

Reason for revert: Breaks the build of multiple devices

Change-Id: I24f17a0fa0c7ba171c4a3639f890e7f4e42f6b1e

media/libmedia/Android.bp

diff --git a/media/libmedia/Android.bp b/media/libmedia/Android.bp
index 435abac..fd7400a 100644
--- a/media/libmedia/Android.bp
+++ b/media/libmedia/Android.bp
@@ -12,8 +12,12 @@
     ],
 }
 
-cc_defaults {
-    name: "libmedia_helper_defaults",
+cc_library {
+    name: "libmedia_helper",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     srcs: ["AudioParameter.cpp", "TypeConverter.cpp"],
     cflags: [
         "-Werror",
@@ -24,23 +28,9 @@
     header_libs: [
         "libmedia_headers",
         "libaudioclient_headers",
-    ],
-    clang: true,
-}
-cc_library {
-    name: "libmedia_helper",
-    defaults: ["libmedia_helper_defaults"],
-    header_libs: [
         "libaudio_system_headers",
     ],
-}
-cc_library {
-    name: "libmedia_helper@2.0",
-    vendor: true,
-    defaults: ["libmedia_helper_defaults"],
-    header_libs: [
-        "android.hardware.audio.common.legacy@2.0",
-    ],
+    clang: true,
 }
 
 cc_library_shared {
@@ -216,7 +206,7 @@
         "libmediaextractor",
         "libgui",
         "libdl",
-        "libaudioutils_system",
+        "libaudioutils",
         "libaudioclient",
         "libmedia_omx",
     ],