diff options
| author | 2016-11-07 17:22:36 +0000 | |
|---|---|---|
| committer | 2016-11-07 17:22:36 +0000 | |
| commit | 1d10b88f404929f63b1b30eed9d31a755db6cb21 (patch) | |
| tree | 356365f5d18e94f0a49157c9ae570c2ead5a50cf | |
| parent | 65710071018141fecd0346ed09e53c262939e54c (diff) | |
| parent | 0a05c49248f8efe1a048b3a6cfaa4ad6d181f858 (diff) | |
Merge "Use libaudioclient"
am: 0a05c49248
Change-Id: I134c9c5b95e446fcc18e2b35a3eca2a4a794e8c8
| -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 bb556107cd6d..143cc2e66253 100644 --- 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 \ diff --git a/media/jni/audioeffect/Android.mk b/media/jni/audioeffect/Android.mk index 5c22c9b96761..8bd8857d8ba6 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_C_INCLUDES := \ $(call include-path-for, audio-effects) 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 |