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 /rs/jni | |
| 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 'rs/jni')
| -rw-r--r-- | rs/jni/Android.mk | 3 | ||||
| -rw-r--r-- | rs/jni/android_renderscript_RenderScript.cpp | 5 |
2 files changed, 2 insertions, 6 deletions
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> |