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/libaudioprocessing/Android.mk

diff --git a/media/libaudioprocessing/Android.mk b/media/libaudioprocessing/Android.mk
index f74834d..da1ecc2 100644
--- a/media/libaudioprocessing/Android.mk
+++ b/media/libaudioprocessing/Android.mk
@@ -20,7 +20,7 @@
 
 LOCAL_SHARED_LIBRARIES := \
     libaudiohal \
-    libaudioutils_system \
+    libaudioutils \
     libcutils \
     liblog \
     libnbaio \

media/libaudioprocessing/tests/Android.mk

diff --git a/media/libaudioprocessing/tests/Android.mk b/media/libaudioprocessing/tests/Android.mk
index 53059ff..23e1c3a 100644
--- a/media/libaudioprocessing/tests/Android.mk
+++ b/media/libaudioprocessing/tests/Android.mk
@@ -8,7 +8,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_SHARED_LIBRARIES := \
-    libaudioutils_system \
+    libaudioutils \
     libaudioprocessing \
     libcutils \
     liblog \
@@ -44,7 +44,7 @@
 
 LOCAL_SHARED_LIBRARIES := \
     libaudioprocessing \
-    libaudioutils_system \
+    libaudioutils \
     libcutils \
     liblog \
     libutils \
@@ -73,7 +73,7 @@
 
 LOCAL_SHARED_LIBRARIES := \
     libaudioprocessing \
-    libaudioutils_system \
+    libaudioutils \
     libcutils \
     liblog \
     libutils \