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

diff --git a/media/libaudiohal/2.0/Android.bp b/media/libaudiohal/2.0/Android.bp
index 0ab8981..574b435 100644
--- a/media/libaudiohal/2.0/Android.bp
+++ b/media/libaudiohal/2.0/Android.bp
@@ -6,6 +6,7 @@
         "DevicesFactoryHalHybrid.cpp",
         "DevicesFactoryHalLocal.cpp",
         "StreamHalLocal.cpp",
+
         "ConversionHelperHidl.cpp",
         "DeviceHalHidl.cpp",
         "DevicesFactoryHalHidl.cpp",
@@ -13,7 +14,6 @@
         "EffectHalHidl.cpp",
         "EffectsFactoryHalHidl.cpp",
         "StreamHalHidl.cpp",
-        "HidlUtils.cpp",
     ],
 
     export_include_dirs: ["."],
@@ -24,7 +24,7 @@
     ],
     shared_libs: [
         "libaudiohal_deathhandler",
-        "libaudioutils_system",
+        "libaudioutils",
         "libcutils",
         "liblog",
         "libutils",
@@ -37,6 +37,7 @@
         "libhidltransport",
         "android.hardware.audio@2.0",
         "android.hardware.audio.common@2.0",
+        "android.hardware.audio.common@2.0-util",
         "android.hardware.audio.effect@2.0",
         "android.hidl.allocator@1.0",
         "android.hidl.memory@1.0",
@@ -44,8 +45,7 @@
         "libmediautils",
     ],
     header_libs: [
-        "libaudiohal_headers",
-        "libaudiohal_util",
+        "libaudiohal_headers"
     ],
 
     export_shared_lib_headers: [