Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18793d77 authored by James Dong's avatar James Dong
Browse files

Revert "Remove libvideoeditor_jni.so's dependency on static libs in video editor engine" 

This reverts commit 1af1f6a6.
parent 859c897b

libvideoeditor/lvpp/Android.mk

+16 −16
Original line number Diff line number Diff line
@@ -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          \

    libutils           \

    libcutils          \

    libEGL                    \

    libGLESv2                 \

    libgui                    \

    libmedia           \

    libmedia_native    \

    libdrmframework    \

    libstagefright  \

    libstagefright_foundation \

    libstagefright_omx  \

    libstagefright_foundation \

    libgui \

    libaudioflinger \

    libui \

    libutils                  \

    libvideoeditor_osal       \

    libEGL \

    libGLESv2





LOCAL_C_INCLUDES += \

libvideoeditor/osal/src/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -63,5 +63,5 @@ LOCAL_CFLAGS += -Wno-multichar \ 
    -DUSE_STAGEFRIGHT_READERS \

    -DUSE_STAGEFRIGHT_3GPP_READER



include $(BUILD_SHARED_LIBRARY)

include $(BUILD_STATIC_LIBRARY)

libvideoeditor/vss/src/Android.mk

+6 −17
Original line number Diff line number Diff line
@@ -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)

libvideoeditor/vss/video_filters/src/Android.mk

+5 −5
Original line number Diff line number Diff line
@@ -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)