diff options
| author | James Dong <jdong@google.com> | 2012-05-15 00:25:22 -0700 |
|---|---|---|
| committer | James Dong <jdong@google.com> | 2012-05-16 01:04:40 -0700 |
| commit | 5ddb19e5305365d23ffd46751d8963d9b739b49d (patch) | |
| tree | 550baf34c92082ecc7561f8d1dd839e0a3873262 | |
| parent | ae14715284837aebe179f790e0456d2bdb367583 (diff) | |
| download | frameworks_base-5ddb19e5305365d23ffd46751d8963d9b739b49d.zip frameworks_base-5ddb19e5305365d23ffd46751d8963d9b739b49d.tar.gz frameworks_base-5ddb19e5305365d23ffd46751d8963d9b739b49d.tar.bz2 | |
Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
related-to-bug: 6502980
Change-Id: I77aa67dac73ecb6200cfc885c426c23d70929e5d
| -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 |