diff options
| author | Derek Sollenberger <djsollen@google.com> | 2014-02-27 14:31:29 -0500 |
|---|---|---|
| committer | Derek Sollenberger <djsollen@google.com> | 2014-02-27 14:31:29 -0500 |
| commit | eece0dda56ae29fff6e9003df97594f6ac50b6e2 (patch) | |
| tree | 46e4cd73a189dabb2e28d2eafaef2b9abf73a82f /core/jni/android | |
| parent | 94b5ca811e5716bddb4a4d86df35c29bb9165e5f (diff) | |
| download | frameworks_base-eece0dda56ae29fff6e9003df97594f6ac50b6e2.zip frameworks_base-eece0dda56ae29fff6e9003df97594f6ac50b6e2.tar.gz frameworks_base-eece0dda56ae29fff6e9003df97594f6ac50b6e2.tar.bz2 | |
Fix includes so that they no longer rely on the global Skia includes directories.
bug:13225538
Change-Id: Ia5d816dc665f81c7985f21036af4fd0a63c560cf
Diffstat (limited to 'core/jni/android')
| -rw-r--r-- | core/jni/android/graphics/Path.cpp | 2 | ||||
| -rw-r--r-- | core/jni/android/opengl/util.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
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" |