diff options
author | James Dong <jdong@google.com> | 2012-05-15 00:25:22 -0700 |
---|---|---|
committer | James Dong <jdong@google.com> | 2012-05-15 00:31:45 -0700 |
commit | cbaa821b7f286a54767cc8bc549504ea2ed86e4d (patch) | |
tree | 110cc09cc750cae481c73df5de6916ec4ce2327c /media/jni/mediaeditor | |
parent | 7b8523aaed11a3b5ee286776023233036ac0759d (diff) | |
download | frameworks_base-cbaa821b7f286a54767cc8bc549504ea2ed86e4d.zip frameworks_base-cbaa821b7f286a54767cc8bc549504ea2ed86e4d.tar.gz frameworks_base-cbaa821b7f286a54767cc8bc549504ea2ed86e4d.tar.bz2 |
Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
related-to-bug: 6328360
Change-Id: Ifc9ffc671f454135db31590805c38f9635e5c815
Diffstat (limited to 'media/jni/mediaeditor')
-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 |