diff options
| author | Eric Laurent <elaurent@google.com> | 2010-06-14 09:10:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-14 09:10:32 -0700 |
| commit | 7f5ee3b58d3dc07b88b313aae83ae424d131b355 (patch) | |
| tree | 884a424a40bd6aa53ff94d78e82b303a6faf07e5 /media/jni/Android.mk | |
| parent | a47078a5b0ac4af7e27846c731c0dedd1a84ca03 (diff) | |
| parent | 184a3ff64ba71e7e860b70b9a836c0132b447138 (diff) | |
| download | frameworks_base-7f5ee3b58d3dc07b88b313aae83ae424d131b355.zip frameworks_base-7f5ee3b58d3dc07b88b313aae83ae424d131b355.tar.gz frameworks_base-7f5ee3b58d3dc07b88b313aae83ae424d131b355.tar.bz2 | |
am 184a3ff6: am e0219539: am 01f7ac64: Merge "Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI." into kraken
Merge commit '184a3ff64ba71e7e860b70b9a836c0132b447138'
* commit '184a3ff64ba71e7e860b70b9a836c0132b447138':
Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI.
Diffstat (limited to 'media/jni/Android.mk')
| -rw-r--r-- | media/jni/Android.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/jni/Android.mk b/media/jni/Android.mk index a6a25cd..698cece 100644 --- a/media/jni/Android.mk +++ b/media/jni/Android.mk @@ -65,4 +65,5 @@ LOCAL_MODULE:= libmedia_jni include $(BUILD_SHARED_LIBRARY) # build libsoundpool.so -include $(LOCAL_PATH)/soundpool/Android.mk +# build libaudioeffect_jni.so +include $(call all-makefiles-under,$(LOCAL_PATH)) |