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

Commit c1e3ed15 authored by Glenn Kasten's avatar Glenn Kasten
Browse files

Fix LOCAL_C_INCLUDES and correct #include syntax 

Change-Id: I522861043cc2ee905258a2ae409bf9dddbe452dc
parent 39485a90

libvideoeditor/lvpp/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -66,8 +66,6 @@ LOCAL_SHARED_LIBRARIES := \ 
LOCAL_C_INCLUDES += \

    $(TOP)/system/media/audio_utils/include \

    $(TOP)/frameworks/base/core/jni \

    $(TOP)/frameworks/base/include \

    $(TOP)/frameworks/base/include/media \

    $(TOP)/frameworks/base/media/libmediaplayerservice \

    $(TOP)/frameworks/base/media/libstagefright \

    $(TOP)/frameworks/base/media/libstagefright/include \

libvideoeditor/lvpp/NativeWindowRenderer.cpp

+3 −3
Original line number Diff line number Diff line
@@ -22,9 +22,9 @@ 
#include <cutils/log.h>

#include <gui/SurfaceTexture.h>

#include <gui/SurfaceTextureClient.h>

#include <stagefright/foundation/ADebug.h>

#include <stagefright/MediaBuffer.h>

#include <stagefright/MetaData.h>

#include <media/stagefright/foundation/ADebug.h>

#include <media/stagefright/MediaBuffer.h>

#include <media/stagefright/MetaData.h>

#include "VideoEditorTools.h"



#define CHECK_EGL_ERROR CHECK(EGL_SUCCESS == eglGetError())

libvideoeditor/lvpp/NativeWindowRenderer.h

+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ 


#include <EGL/egl.h>

#include <GLES2/gl2.h>

#include <stagefright/MediaBuffer.h>

#include <stagefright/MetaData.h>

#include <media/stagefright/MediaBuffer.h>

#include <media/stagefright/MetaData.h>

#include <utils/RefBase.h>

#include <utils/threads.h>

libvideoeditor/lvpp/VideoEditorPlayer.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#define ANDROID_VIDEOEDITOR_PLAYER_H



#include <media/MediaPlayerInterface.h>

#include "AudioTrack.h"

#include <media/AudioTrack.h>

#include "M4xVSS_API.h"

#include "VideoEditorMain.h"

#include "VideoEditorTools.h"

libvideoeditor/vss/src/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ LOCAL_STATIC_LIBRARIES := \ 
LOCAL_C_INCLUDES += \

    $(TOP)/system/media/audio_utils/include \

    $(TOP)/system/media/audio_effects/include \

    $(TOP)/frameworks/base/include \

    $(TOP)/frameworks/media/libvideoeditor/osal/inc \

    $(TOP)/frameworks/media/libvideoeditor/vss/inc \

    $(TOP)/frameworks/media/libvideoeditor/vss/mcs/inc \