diff options
| -rw-r--r-- | cmds/bootanimation/Android.mk | 3 | ||||
| -rw-r--r-- | cmds/bootanimation/BootAnimation.cpp | 6 | ||||
| -rw-r--r-- | core/jni/android/graphics/Path.cpp | 2 | ||||
| -rw-r--r-- | core/jni/android/opengl/util.cpp | 2 | ||||
| -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 | ||||
| -rw-r--r-- | rs/jni/Android.mk | 3 | ||||
| -rw-r--r-- | rs/jni/android_renderscript_RenderScript.cpp | 5 |
10 files changed, 10 insertions, 19 deletions
diff --git a/cmds/bootanimation/Android.mk b/cmds/bootanimation/Android.mk index d5ff84e..a4e2718 100644 --- a/cmds/bootanimation/Android.mk +++ b/cmds/bootanimation/Android.mk @@ -19,9 +19,6 @@ LOCAL_SHARED_LIBRARIES := \ libGLESv1_CM \ libgui -LOCAL_C_INCLUDES := \ - $(call include-path-for, corecg graphics) - LOCAL_MODULE:= bootanimation diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp index 125bea6..e12e961 100644 --- a/cmds/bootanimation/BootAnimation.cpp +++ b/cmds/bootanimation/BootAnimation.cpp @@ -42,9 +42,9 @@ #include <gui/Surface.h> #include <gui/SurfaceComposerClient.h> -#include <core/SkBitmap.h> -#include <core/SkStream.h> -#include <core/SkImageDecoder.h> +#include <SkBitmap.h> +#include <SkStream.h> +#include <SkImageDecoder.h> #include <GLES/gl.h> #include <GLES/glext.h> diff --git a/core/jni/android/graphics/Path.cpp b/core/jni/android/graphics/Path.cpp index 6bbf45a..429f177 100644 --- a/core/jni/android/graphics/Path.cpp +++ b/core/jni/android/graphics/Path.cpp @@ -25,7 +25,7 @@ #include <android_runtime/AndroidRuntime.h> #include "SkPath.h" -#include "pathops/SkPathOps.h" +#include "SkPathOps.h" #include <Caches.h> #include <vector> diff --git a/core/jni/android/opengl/util.cpp b/core/jni/android/opengl/util.cpp index a17f328..a91c622 100644 --- a/core/jni/android/opengl/util.cpp +++ b/core/jni/android/opengl/util.cpp @@ -27,7 +27,7 @@ #include <GLES/gl.h> #include <ETC1/etc1.h> -#include <core/SkBitmap.h> +#include <SkBitmap.h> #include "android_runtime/AndroidRuntime.h" 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> diff --git a/rs/jni/Android.mk b/rs/jni/Android.mk index cbb5b3b..07933b4 100644 --- a/rs/jni/Android.mk +++ b/rs/jni/Android.mk @@ -23,8 +23,7 @@ rs_generated_include_dir := $(call intermediates-dir-for,SHARED_LIBRARIES,libRS, LOCAL_C_INCLUDES += \ $(JNI_H_INCLUDE) \ frameworks/rs \ - $(rs_generated_include_dir) \ - $(call include-path-for, corecg graphics) + $(rs_generated_include_dir) LOCAL_CFLAGS += -Wno-unused-parameter diff --git a/rs/jni/android_renderscript_RenderScript.cpp b/rs/jni/android_renderscript_RenderScript.cpp index 80a5da2..517704a 100644 --- a/rs/jni/android_renderscript_RenderScript.cpp +++ b/rs/jni/android_renderscript_RenderScript.cpp @@ -23,10 +23,7 @@ #include <math.h> #include <utils/misc.h> -#include <core/SkBitmap.h> -#include <core/SkPixelRef.h> -#include <core/SkStream.h> -#include <core/SkTemplates.h> +#include <SkBitmap.h> #include <androidfw/Asset.h> #include <androidfw/AssetManager.h> |