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

services/audioflinger/Android.mk

diff --git a/services/audioflinger/Android.mk b/services/audioflinger/Android.mk
index c6426da..7419e64 100644
--- a/services/audioflinger/Android.mk
+++ b/services/audioflinger/Android.mk
@@ -42,7 +42,7 @@
     libaudiohal \
     libaudioprocessing \
     libaudiospdif \
-    libaudioutils_system \
+    libaudioutils \
     libcutils \
     libutils \
     liblog \

services/audiopolicy/engineconfigurable/Android.mk

diff --git a/services/audiopolicy/engineconfigurable/Android.mk b/services/audiopolicy/engineconfigurable/Android.mk
index aa4b758..c2105e9 100644
--- a/services/audiopolicy/engineconfigurable/Android.mk
+++ b/services/audiopolicy/engineconfigurable/Android.mk
@@ -49,7 +49,7 @@
     libcutils \
     libutils \
     liblog \
-    libaudioutils_system \
+    libaudioutils \
     libparameter \
     libmedia_helper \
     libxml2

services/medialog/Android.bp

diff --git a/services/medialog/Android.bp b/services/medialog/Android.bp
index e0e878f..29e6dfc 100644
--- a/services/medialog/Android.bp
+++ b/services/medialog/Android.bp
@@ -7,7 +7,7 @@
     ],
 
     shared_libs: [
-        "libaudioutils_system",
+        "libaudioutils",
         "libbinder",
         "liblog",
         "libnbaio",