diff options
| author | James Dong <jdong@google.com> | 2012-05-15 00:27:46 -0700 |
|---|---|---|
| committer | James Dong <jdong@google.com> | 2012-05-16 01:03:45 -0700 |
| commit | a86c809bff463ae1d782dcaa1c45d1acea5f34d3 (patch) | |
| tree | b67c548b15268ca9cbb6c242d98f012d2f487914 /libvideoeditor/vss | |
| parent | 62999949c58ae18784a6061d83e4f2b78dbc3465 (diff) | |
| download | frameworks_av-a86c809bff463ae1d782dcaa1c45d1acea5f34d3.zip frameworks_av-a86c809bff463ae1d782dcaa1c45d1acea5f34d3.tar.gz frameworks_av-a86c809bff463ae1d782dcaa1c45d1acea5f34d3.tar.bz2 | |
Remove libvideoeditor_jni.so's dependency on static libs in video editor engine
related-to-bug: 6502980
Change-Id: I9cbbf44eb53c406263df4003cc3de2af4d239180
Diffstat (limited to 'libvideoeditor/vss')
| -rwxr-xr-x | libvideoeditor/vss/3gpwriter/src/Android.mk | 8 | ||||
| -rwxr-xr-x | libvideoeditor/vss/mcs/src/Android.mk | 8 | ||||
| -rwxr-xr-x | libvideoeditor/vss/src/Android.mk | 23 | ||||
| -rwxr-xr-x | libvideoeditor/vss/stagefrightshells/src/Android.mk | 22 | ||||
| -rwxr-xr-x | libvideoeditor/vss/video_filters/src/Android.mk | 10 |
5 files changed, 40 insertions, 31 deletions
diff --git a/libvideoeditor/vss/3gpwriter/src/Android.mk b/libvideoeditor/vss/3gpwriter/src/Android.mk index 057c348..8ab32ba 100755 --- a/libvideoeditor/vss/3gpwriter/src/Android.mk +++ b/libvideoeditor/vss/3gpwriter/src/Android.mk @@ -31,10 +31,10 @@ LOCAL_SRC_FILES:= \ LOCAL_MODULE_TAGS := optional -LOCAL_SHARED_LIBRARIES := libcutils libutils - -LOCAL_STATIC_LIBRARIES := \ - libvideoeditor_osal +LOCAL_SHARED_LIBRARIES := \ + libcutils \ + libutils \ + libvideoeditor_osal \ LOCAL_C_INCLUDES += \ $(TOP)/frameworks/av/libvideoeditor/osal/inc \ diff --git a/libvideoeditor/vss/mcs/src/Android.mk b/libvideoeditor/vss/mcs/src/Android.mk index 37986b9..b470e6b 100755 --- a/libvideoeditor/vss/mcs/src/Android.mk +++ b/libvideoeditor/vss/mcs/src/Android.mk @@ -33,10 +33,10 @@ LOCAL_SRC_FILES:= \ LOCAL_MODULE_TAGS := optional -LOCAL_SHARED_LIBRARIES := libcutils libutils - -LOCAL_STATIC_LIBRARIES := \ - libvideoeditor_osal +LOCAL_SHARED_LIBRARIES := \ + libcutils \ + libutils \ + libvideoeditor_osal \ LOCAL_C_INCLUDES += \ $(TOP)/frameworks/av/libvideoeditor/osal/inc \ diff --git a/libvideoeditor/vss/src/Android.mk b/libvideoeditor/vss/src/Android.mk index 7d9cd9d..cda7a83 100755 --- a/libvideoeditor/vss/src/Android.mk +++ b/libvideoeditor/vss/src/Android.mk @@ -52,14 +52,25 @@ LOCAL_SRC_FILES:= \ LOCAL_MODULE_TAGS := optional -LOCAL_SHARED_LIBRARIES := libcutils libutils libaudioutils +LOCAL_SHARED_LIBRARIES := \ + libaudioflinger \ + libaudioutils \ + libbinder \ + libcutils \ + libmedia \ + libstagefright \ + libstagefright_foundation \ + libstagefright_omx \ + libutils \ + libvideoeditor_osal \ + libvideoeditor_videofilters \ + libvideoeditorplayer \ LOCAL_STATIC_LIBRARIES := \ - libvideoeditor_osal \ - libvideoeditor_3gpwriter \ + libstagefright_color_conversion \ libvideoeditor_mcs \ - libvideoeditor_videofilters \ - libvideoeditor_stagefrightshells + libvideoeditor_stagefrightshells \ + libvideoeditor_3gpwriter \ LOCAL_C_INCLUDES += \ $(TOP)/frameworks/av/libvideoeditor/osal/inc \ @@ -84,5 +95,5 @@ LOCAL_CFLAGS += -Wno-multichar \ -DM4xVSS_RESERVED_MOOV_DISK_SPACEno \ -DDECODE_GIF_ON_SAVING -include $(BUILD_STATIC_LIBRARY) +include $(BUILD_SHARED_LIBRARY) diff --git a/libvideoeditor/vss/stagefrightshells/src/Android.mk b/libvideoeditor/vss/stagefrightshells/src/Android.mk index 378a795..e30b85d 100755 --- a/libvideoeditor/vss/stagefrightshells/src/Android.mk +++ b/libvideoeditor/vss/stagefrightshells/src/Android.mk @@ -43,23 +43,21 @@ LOCAL_C_INCLUDES += \ $(TOP)/frameworks/native/include/media/editor \ $(TOP)/frameworks/native/include/media/openmax -LOCAL_SHARED_LIBRARIES := \ - libcutils \ - libutils \ - libmedia \ - libbinder \ - libstagefright \ +LOCAL_SHARED_LIBRARIES := \ + libcutils \ + libutils \ + libmedia \ + libbinder \ + libstagefright \ libstagefright_foundation \ - libstagefright_omx \ - libgui \ - libvideoeditorplayer + libstagefright_omx \ + libgui \ + libvideoeditor_osal \ + libvideoeditorplayer \ LOCAL_CFLAGS += \ - - LOCAL_STATIC_LIBRARIES := \ - libvideoeditor_osal \ libstagefright_color_conversion diff --git a/libvideoeditor/vss/video_filters/src/Android.mk b/libvideoeditor/vss/video_filters/src/Android.mk index cc2540c..85a530c 100755 --- a/libvideoeditor/vss/video_filters/src/Android.mk +++ b/libvideoeditor/vss/video_filters/src/Android.mk @@ -36,10 +36,10 @@ LOCAL_SRC_FILES:= \ LOCAL_MODULE_TAGS := optional -LOCAL_SHARED_LIBRARIES := libcutils libutils - -LOCAL_STATIC_LIBRARIES := \ - libvideoeditor_osal +LOCAL_SHARED_LIBRARIES := \ + libcutils \ + libutils \ + libvideoeditor_osal \ LOCAL_C_INCLUDES += \ $(TOP)/frameworks/av/libvideoeditor/osal/inc \ @@ -53,5 +53,5 @@ LOCAL_LDLIBS := \ LOCAL_CFLAGS += -Wno-multichar -include $(BUILD_STATIC_LIBRARY) +include $(BUILD_SHARED_LIBRARY) |