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/libnbaio/Android.bp

diff --git a/media/libnbaio/Android.bp b/media/libnbaio/Android.bp
index cdc7f76..a4df38d 100644
--- a/media/libnbaio/Android.bp
+++ b/media/libnbaio/Android.bp
@@ -8,6 +8,7 @@
     ],
     header_libs: [
         "libaudioclient_headers",
+        "libaudio_system_headers",
         "libmedia_headers",
     ],
     export_header_lib_headers: [
@@ -16,6 +17,7 @@
     ],
 
     shared_libs: [
+        "libaudioutils",
         "liblog",
         "libutils",
     ],
@@ -27,17 +29,9 @@
 // link against libnbaio and system modules can't link against libnbaio_mono. The rest of libnbaio
 // pulls in too many other dependencies.
 cc_library_shared {
-    name: "libnbaio_mono@2.0",
+    name: "libnbaio_mono",
     vendor: true,
     defaults: ["libnbaio_mono_defaults"],
-
-    shared_libs: [
-        "libaudioutils",
-    ],
-
-    header_libs: [
-        "android.hardware.audio.common.legacy@2.0",
-    ],
 }
 
 cc_library_shared {
@@ -60,17 +54,13 @@
     // static_libs: ["libsndfile"],
 
     shared_libs: [
-        "libaudioutils_system",
+        "libaudioutils",
         "libbinder",
         "libcutils",
         "liblog",
         "libutils",
     ],
 
-    header_libs: [
-        "libaudio_system_headers",
-    ],
-
     cflags: [
         "-Werror",
         "-Wall",