summaryrefslogtreecommitdiffstats
path: root/libvideoeditor/vss/video_filters
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2012-05-15 14:50:45 -0700
committerJames Dong <jdong@google.com>2012-05-15 14:50:45 -0700
commit18793d77792e12f5f63e67f721bc238b6dc497a1 (patch)
treefd2a5c336e51be8e2516a27b9d6a9236e9b8b34d /libvideoeditor/vss/video_filters
parent859c897b87593386d7c37ab844d4890aaa19bceb (diff)
downloadframeworks_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.
Diffstat (limited to 'libvideoeditor/vss/video_filters')
-rwxr-xr-xlibvideoeditor/vss/video_filters/src/Android.mk10
1 files changed, 5 insertions, 5 deletions
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)