diff options
| author | Derek Sollenberger <djsollen@google.com> | 2014-02-28 13:23:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-28 13:23:15 +0000 |
| commit | fc9276340897289b8f848fc722152d6fc0f891ed (patch) | |
| tree | 14cca48e01e4c491bd5ffe9499a96cd2e42e9d91 /media | |
| parent | ef23865154bf5e6c1768023dd69845353cf8c543 (diff) | |
| parent | eece0dda56ae29fff6e9003df97594f6ac50b6e2 (diff) | |
| download | frameworks_base-fc9276340897289b8f848fc722152d6fc0f891ed.zip frameworks_base-fc9276340897289b8f848fc722152d6fc0f891ed.tar.gz frameworks_base-fc9276340897289b8f848fc722152d6fc0f891ed.tar.bz2 | |
Merge "Fix includes so that they no longer rely on the global Skia includes directories."
Diffstat (limited to 'media')
| -rw-r--r-- | media/jni/Android.mk | 3 | ||||
| -rw-r--r-- | media/jni/android_media_MediaMetadataRetriever.cpp | 2 | ||||
| -rw-r--r-- | media/jni/mediaeditor/Android.mk | 1 | ||||
| -rw-r--r-- | media/tests/omxjpegdecoder/StreamSource.h | 2 |
4 files changed, 3 insertions, 5 deletions
diff --git a/media/jni/Android.mk b/media/jni/Android.mk index 51fccd4..35327c0 100644 --- a/media/jni/Android.mk +++ b/media/jni/Android.mk @@ -61,8 +61,7 @@ LOCAL_C_INCLUDES += \ $(call include-path-for, libhardware)/hardware \ system/media/camera/include \ $(PV_INCLUDES) \ - $(JNI_H_INCLUDE) \ - $(call include-path-for, corecg graphics) + $(JNI_H_INCLUDE) LOCAL_CFLAGS += diff --git a/media/jni/android_media_MediaMetadataRetriever.cpp b/media/jni/android_media_MediaMetadataRetriever.cpp index f17209f..f3a7ff7 100644 --- a/media/jni/android_media_MediaMetadataRetriever.cpp +++ b/media/jni/android_media_MediaMetadataRetriever.cpp @@ -21,7 +21,7 @@ #include <assert.h> #include <utils/Log.h> #include <utils/threads.h> -#include <core/SkBitmap.h> +#include <SkBitmap.h> #include <media/IMediaHTTPService.h> #include <media/mediametadataretriever.h> #include <private/media/VideoFrame.h> diff --git a/media/jni/mediaeditor/Android.mk b/media/jni/mediaeditor/Android.mk index 6be7fdd..76e8346 100644 --- a/media/jni/mediaeditor/Android.mk +++ b/media/jni/mediaeditor/Android.mk @@ -35,7 +35,6 @@ LOCAL_C_INCLUDES += \ $(TOP)/frameworks/base/media/libstagefright/include \ $(TOP)/frameworks/base/media/libstagefright/rtsp \ $(JNI_H_INCLUDE) \ - $(call include-path-for, corecg graphics) \ $(TOP)/frameworks/native/include/media/editor \ $(TOP)/frameworks/base/core/jni/mediaeditor \ $(TOP)/frameworks/av/libvideoeditor/vss/inc \ diff --git a/media/tests/omxjpegdecoder/StreamSource.h b/media/tests/omxjpegdecoder/StreamSource.h index 6c34cbd..9807385 100644 --- a/media/tests/omxjpegdecoder/StreamSource.h +++ b/media/tests/omxjpegdecoder/StreamSource.h @@ -20,7 +20,7 @@ #include <stdio.h> -#include <core/SkStream.h> +#include <SkStream.h> #include <media/stagefright/DataSource.h> #include <media/stagefright/MediaErrors.h> #include <utils/threads.h> |