diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-03-13 15:22:11 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2012-03-14 15:39:50 -0700 |
| commit | c1e3ed15d86337361c11fc4bb425ae252eceb946 (patch) | |
| tree | 44c62cc1a5366383a16c149cbe8f6d07f3bb538b /libvideoeditor | |
| parent | 39485a9071b06ab8bb390844ae39f783d6c0ed25 (diff) | |
| download | frameworks_av-c1e3ed15d86337361c11fc4bb425ae252eceb946.zip frameworks_av-c1e3ed15d86337361c11fc4bb425ae252eceb946.tar.gz frameworks_av-c1e3ed15d86337361c11fc4bb425ae252eceb946.tar.bz2 | |
Fix LOCAL_C_INCLUDES and correct #include syntax
Change-Id: I522861043cc2ee905258a2ae409bf9dddbe452dc
Diffstat (limited to 'libvideoeditor')
| -rwxr-xr-x | libvideoeditor/lvpp/Android.mk | 2 | ||||
| -rwxr-xr-x | libvideoeditor/lvpp/NativeWindowRenderer.cpp | 6 | ||||
| -rwxr-xr-x | libvideoeditor/lvpp/NativeWindowRenderer.h | 4 | ||||
| -rwxr-xr-x | libvideoeditor/lvpp/VideoEditorPlayer.h | 2 | ||||
| -rwxr-xr-x | libvideoeditor/vss/src/Android.mk | 1 | ||||
| -rwxr-xr-x | libvideoeditor/vss/stagefrightshells/src/Android.mk | 2 |
6 files changed, 6 insertions, 11 deletions
diff --git a/libvideoeditor/lvpp/Android.mk b/libvideoeditor/lvpp/Android.mk index 584c70c..f62b5db 100755 --- a/libvideoeditor/lvpp/Android.mk +++ b/libvideoeditor/lvpp/Android.mk @@ -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 \ diff --git a/libvideoeditor/lvpp/NativeWindowRenderer.cpp b/libvideoeditor/lvpp/NativeWindowRenderer.cpp index cd4ff6c..0f3ea3c 100755 --- a/libvideoeditor/lvpp/NativeWindowRenderer.cpp +++ b/libvideoeditor/lvpp/NativeWindowRenderer.cpp @@ -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()) diff --git a/libvideoeditor/lvpp/NativeWindowRenderer.h b/libvideoeditor/lvpp/NativeWindowRenderer.h index cafd6fb..8fbb4f9 100755 --- a/libvideoeditor/lvpp/NativeWindowRenderer.h +++ b/libvideoeditor/lvpp/NativeWindowRenderer.h @@ -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> diff --git a/libvideoeditor/lvpp/VideoEditorPlayer.h b/libvideoeditor/lvpp/VideoEditorPlayer.h index 34f9bc5..6962501 100755 --- a/libvideoeditor/lvpp/VideoEditorPlayer.h +++ b/libvideoeditor/lvpp/VideoEditorPlayer.h @@ -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" diff --git a/libvideoeditor/vss/src/Android.mk b/libvideoeditor/vss/src/Android.mk index cf164a3..1beb162 100755 --- a/libvideoeditor/vss/src/Android.mk +++ b/libvideoeditor/vss/src/Android.mk @@ -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 \ diff --git a/libvideoeditor/vss/stagefrightshells/src/Android.mk b/libvideoeditor/vss/stagefrightshells/src/Android.mk index 772efdd..5b8e270 100755 --- a/libvideoeditor/vss/stagefrightshells/src/Android.mk +++ b/libvideoeditor/vss/stagefrightshells/src/Android.mk @@ -30,8 +30,6 @@ LOCAL_SRC_FILES:= \ LOCAL_C_INCLUDES += \ $(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 \ |