diff options
| author | James Dong <jdong@google.com> | 2012-05-15 14:24:13 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-15 14:24:13 -0700 |
| commit | 6387c8a9cb52e6b7bb1a0fb40ee3b66c00ad6697 (patch) | |
| tree | 89ee8aceacd10d8c77a6e66d0d06ecc0e3efcb61 | |
| parent | bea7afc52cc85e35b7fc200912246c62d3791198 (diff) | |
| parent | cbaa821b7f286a54767cc8bc549504ea2ed86e4d (diff) | |
| download | frameworks_base-6387c8a9cb52e6b7bb1a0fb40ee3b66c00ad6697.zip frameworks_base-6387c8a9cb52e6b7bb1a0fb40ee3b66c00ad6697.tar.gz frameworks_base-6387c8a9cb52e6b7bb1a0fb40ee3b66c00ad6697.tar.bz2 | |
Merge "Remove dependency of libvideoeditor_jni.so on static libs from video editor engine" into jb-dev
| -rwxr-xr-x | media/jni/mediaeditor/Android.mk | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/media/jni/mediaeditor/Android.mk b/media/jni/mediaeditor/Android.mk index d1cf8b5..040d2ab 100755 --- a/media/jni/mediaeditor/Android.mk +++ b/media/jni/mediaeditor/Android.mk @@ -47,20 +47,23 @@ LOCAL_C_INCLUDES += \ $(TOP)/frameworks/native/include/media/openmax LOCAL_SHARED_LIBRARIES := \ + libandroid_runtime \ + libaudioflinger \ libaudioutils \ + libbinder \ libcutils \ libdl \ - libutils \ - libandroid_runtime \ - libnativehelper \ + libgui \ libmedia \ - libaudioflinger \ - libbinder \ + libnativehelper \ libstagefright \ libstagefright_foundation \ libstagefright_omx \ - libgui \ - libvideoeditorplayer + libutils \ + libvideoeditor_core \ + libvideoeditor_osal \ + libvideoeditor_videofilters \ + libvideoeditorplayer \ LOCAL_CFLAGS += \ @@ -72,15 +75,6 @@ LOCAL_CFLAGS += \ -DUSE_STAGEFRIGHT_READERS \ -DUSE_STAGEFRIGHT_3GPP_READER -LOCAL_STATIC_LIBRARIES := \ - libvideoeditor_core \ - libstagefright_color_conversion \ - libvideoeditor_3gpwriter \ - libvideoeditor_mcs \ - libvideoeditor_videofilters \ - libvideoeditor_stagefrightshells \ - libvideoeditor_osal - LOCAL_MODULE:= libvideoeditor_jni LOCAL_MODULE_TAGS := optional |