Merge "Use libaudioclient" am: 0a05c49248

am: 1d10b88f40 Change-Id: I55ad06914aae308f7ffa46c27b9bab3db46cdc1c
2016-11-07 17:31:52 +00:00
parent a99a05982e 1d10b88f40
commit e327563c6c
4 changed files with 6 additions and 3 deletions
--- a/core/jni/Android.mk
+++ b/core/jni/Android.mk
@@ -250,6 +250,7 @@ LOCAL_SHARED_LIBRARIES := \
    libicuuc \
    libicui18n \
    libmedia \
+    libaudioclient \
    libjpeg \
    libusbhost \
    libharfbuzz_ng \
--- a/media/jni/audioeffect/Android.mk
+++ b/media/jni/audioeffect/Android.mk
@@ -11,7 +11,8 @@ LOCAL_SHARED_LIBRARIES := \
    libutils \
    libandroid_runtime \
    libnativehelper \
-    libmedia
+    libmedia \
+    libaudioclient \

 LOCAL_C_INCLUDES := \
    $(call include-path-for, audio-effects)
--- a/media/jni/soundpool/Android.mk
+++ b/media/jni/soundpool/Android.mk
@@ -12,7 +12,7 @@ LOCAL_SHARED_LIBRARIES := \
    libutils \
    libandroid_runtime \
    libnativehelper \
-    libmedia \
+    libaudioclient \
    libmediandk \
    libbinder

--- a/media/tests/audiotests/Android.mk
+++ b/media/tests/audiotests/Android.mk
@@ -15,7 +15,8 @@ LOCAL_SHARED_LIBRARIES :=  \
    libutils \
    libbinder \
    libhardware_legacy \
-    libmedia
+    libmedia \
+    libaudioclient \

 LOCAL_MODULE_TAGS := tests