diff options
| author | James Dong <jdong@google.com> | 2012-05-15 14:50:45 -0700 |
|---|---|---|
| committer | James Dong <jdong@google.com> | 2012-05-15 14:50:45 -0700 |
| commit | 18793d77792e12f5f63e67f721bc238b6dc497a1 (patch) | |
| tree | fd2a5c336e51be8e2516a27b9d6a9236e9b8b34d | |
| parent | 859c897b87593386d7c37ab844d4890aaa19bceb (diff) | |
| download | frameworks_av-18793d77792e12f5f63e67f721bc238b6dc497a1.zip frameworks_av-18793d77792e12f5f63e67f721bc238b6dc497a1.tar.gz frameworks_av-18793d77792e12f5f63e67f721bc238b6dc497a1.tar.bz2 | |
Revert "Remove libvideoeditor_jni.so's dependency on static libs in video editor engine"
This reverts commit 1af1f6a60b9fa217b6809e767babf1ce8a2e95c9.
| -rwxr-xr-x | libvideoeditor/lvpp/Android.mk | 32 | ||||
| -rwxr-xr-x | libvideoeditor/osal/src/Android.mk | 2 | ||||
| -rwxr-xr-x | libvideoeditor/vss/src/Android.mk | 23 | ||||
| -rwxr-xr-x | libvideoeditor/vss/video_filters/src/Android.mk | 10 |
4 files changed, 28 insertions, 39 deletions
diff --git a/libvideoeditor/lvpp/Android.mk b/libvideoeditor/lvpp/Android.mk index c018d74..f805ff7 100755 --- a/libvideoeditor/lvpp/Android.mk +++ b/libvideoeditor/lvpp/Android.mk @@ -41,27 +41,27 @@ LOCAL_SRC_FILES:= \ LOCAL_MODULE_TAGS := optional LOCAL_STATIC_LIBRARIES := \ + libvideoeditor_osal \ libstagefright_color_conversion -LOCAL_SHARED_LIBRARIES := \ - libaudioflinger \ - libaudioutils \ - libbinder \ - libcutils \ - libEGL \ - libGLESv2 \ - libgui \ - libmedia \ - libmedia_native \ - libdrmframework \ - libstagefright \ +LOCAL_SHARED_LIBRARIES := \ + libaudioutils \ + libbinder \ + libutils \ + libcutils \ + libmedia \ + libmedia_native \ + libdrmframework \ + libstagefright \ + libstagefright_omx \ libstagefright_foundation \ - libstagefright_omx \ - libui \ - libutils \ - libvideoeditor_osal \ + libgui \ + libaudioflinger \ + libui \ + libEGL \ + libGLESv2 LOCAL_C_INCLUDES += \ diff --git a/libvideoeditor/osal/src/Android.mk b/libvideoeditor/osal/src/Android.mk index b73b9ae..5415e96 100755 --- a/libvideoeditor/osal/src/Android.mk +++ b/libvideoeditor/osal/src/Android.mk @@ -63,5 +63,5 @@ LOCAL_CFLAGS += -Wno-multichar \ -DUSE_STAGEFRIGHT_READERS \ -DUSE_STAGEFRIGHT_3GPP_READER -include $(BUILD_SHARED_LIBRARY) +include $(BUILD_STATIC_LIBRARY) diff --git a/libvideoeditor/vss/src/Android.mk b/libvideoeditor/vss/src/Android.mk index cda7a83..7d9cd9d 100755 --- a/libvideoeditor/vss/src/Android.mk +++ b/libvideoeditor/vss/src/Android.mk @@ -52,25 +52,14 @@ LOCAL_SRC_FILES:= \ LOCAL_MODULE_TAGS := optional -LOCAL_SHARED_LIBRARIES := \ - libaudioflinger \ - libaudioutils \ - libbinder \ - libcutils \ - libmedia \ - libstagefright \ - libstagefright_foundation \ - libstagefright_omx \ - libutils \ - libvideoeditor_osal \ - libvideoeditor_videofilters \ - libvideoeditorplayer \ +LOCAL_SHARED_LIBRARIES := libcutils libutils libaudioutils LOCAL_STATIC_LIBRARIES := \ - libstagefright_color_conversion \ - libvideoeditor_mcs \ - libvideoeditor_stagefrightshells \ + libvideoeditor_osal \ libvideoeditor_3gpwriter \ + libvideoeditor_mcs \ + libvideoeditor_videofilters \ + libvideoeditor_stagefrightshells LOCAL_C_INCLUDES += \ $(TOP)/frameworks/av/libvideoeditor/osal/inc \ @@ -95,5 +84,5 @@ LOCAL_CFLAGS += -Wno-multichar \ -DM4xVSS_RESERVED_MOOV_DISK_SPACEno \ -DDECODE_GIF_ON_SAVING -include $(BUILD_SHARED_LIBRARY) +include $(BUILD_STATIC_LIBRARY) diff --git a/libvideoeditor/vss/video_filters/src/Android.mk b/libvideoeditor/vss/video_filters/src/Android.mk index 85a530c..cc2540c 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 \ - libvideoeditor_osal \ +LOCAL_SHARED_LIBRARIES := libcutils libutils + +LOCAL_STATIC_LIBRARIES := \ + libvideoeditor_osal LOCAL_C_INCLUDES += \ $(TOP)/frameworks/av/libvideoeditor/osal/inc \ @@ -53,5 +53,5 @@ LOCAL_LDLIBS := \ LOCAL_CFLAGS += -Wno-multichar -include $(BUILD_SHARED_LIBRARY) +include $(BUILD_STATIC_LIBRARY) |