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

Commit 1fb01d9a authored by James Dong's avatar James Dong Committed by Android Git Automerger
Browse files

am 6387c8a9: Merge "Remove dependency of libvideoeditor_jni.so on static libs... 

am 6387c8a9: Merge "Remove dependency of libvideoeditor_jni.so on static libs from video editor engine" into jb-dev

* commit '6387c8a9':
  Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
parents b4652172 6387c8a9

media/jni/mediaeditor/Android.mk

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