diff options
| author | 2016-11-04 21:53:53 +0000 | |
|---|---|---|
| committer | 2016-11-04 21:53:57 +0000 | |
| commit | 9a9e54cfb7435517890d99a90759cf281e0a9270 (patch) | |
| tree | 9439892e50bed39c2c25200cce60f66d59e1d84b | |
| parent | cbc59b8aa620ce6eea50bd787d2daa0d5232fe68 (diff) | |
| parent | 20edcbc89cc66283c892551433f74f00c1244a15 (diff) | |
Merge "Use libaudioclient"
| -rw-r--r-- | core/jni/Android.mk | 1 | ||||
| -rw-r--r-- | media/jni/audioeffect/Android.mk | 3 | ||||
| -rw-r--r-- | media/jni/soundpool/Android.mk | 2 | ||||
| -rw-r--r-- | media/tests/audiotests/Android.mk | 3 |
4 files changed, 6 insertions, 3 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index 506a28457c1d..91e831074615 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -259,6 +259,7 @@ LOCAL_SHARED_LIBRARIES := \ libicuuc \ libicui18n \ libmedia \ + libaudioclient \ libjpeg \ libusbhost \ libharfbuzz_ng \ diff --git a/media/jni/audioeffect/Android.mk b/media/jni/audioeffect/Android.mk index 91dd8a5cc3ae..777636b20901 100644 --- 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_MODULE:= libaudioeffect_jni diff --git a/media/jni/soundpool/Android.mk b/media/jni/soundpool/Android.mk index 2bc41b56d5aa..509a59b549b5 100644 --- 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 diff --git a/media/tests/audiotests/Android.mk b/media/tests/audiotests/Android.mk index 57be372dcf5d..01e42bd2e107 100644 --- 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 |