commit 0a05c49248f8efe1a048b3a6cfaa4ad6d181f858
author Marco Nelissen <marcone@google.com> Mon Nov 07 17:14:24 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 07 17:14:25 2016 +0000
tree 07a490ff480f3cdd5e7b1bb4b3fb2c98f203f65d
parent 74b1131cc820f817ece95eef2aa96f7181acdd95
parent 74abdda6a068b2a1e1afd809138a14b8bdbdbbe9

Merge "Use libaudioclient"

core/jni/Android.mk

diff --git a/core/jni/Android.mk b/core/jni/Android.mk
index bb55610..143cc2e 100644
--- a/core/jni/Android.mk
+++ b/core/jni/Android.mk
@@ -250,6 +250,7 @@
     libicuuc \
     libicui18n \
     libmedia \
+    libaudioclient \
     libjpeg \
     libusbhost \
     libharfbuzz_ng \

media/jni/audioeffect/Android.mk

diff --git a/media/jni/audioeffect/Android.mk b/media/jni/audioeffect/Android.mk
index 5c22c9b..8bd8857 100644
--- a/media/jni/audioeffect/Android.mk
+++ b/media/jni/audioeffect/Android.mk
@@ -11,7 +11,8 @@
     libutils \
     libandroid_runtime \
     libnativehelper \
-    libmedia
+    libmedia \
+    libaudioclient \
 
 LOCAL_C_INCLUDES := \
     $(call include-path-for, audio-effects)

media/jni/soundpool/Android.mk

diff --git a/media/jni/soundpool/Android.mk b/media/jni/soundpool/Android.mk
index 2bc41b5..509a59b 100644
--- a/media/jni/soundpool/Android.mk
+++ b/media/jni/soundpool/Android.mk
@@ -12,7 +12,7 @@
     libutils \
     libandroid_runtime \
     libnativehelper \
-    libmedia \
+    libaudioclient \
     libmediandk \
     libbinder
 

media/tests/audiotests/Android.mk

diff --git a/media/tests/audiotests/Android.mk b/media/tests/audiotests/Android.mk
index 57be372..01e42bd 100644
--- a/media/tests/audiotests/Android.mk
+++ b/media/tests/audiotests/Android.mk
@@ -15,7 +15,8 @@
     libutils \
     libbinder \
     libhardware_legacy \
-    libmedia
+    libmedia \
+    libaudioclient \
 
 LOCAL_MODULE_TAGS := tests