diff options
Diffstat (limited to 'rs/jni')
| -rw-r--r-- | rs/jni/Android.mk | 3 | ||||
| -rw-r--r-- | rs/jni/android_renderscript_RenderScript.cpp | 7 |
2 files changed, 3 insertions, 7 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 352bd49..671b43d 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> @@ -392,7 +389,7 @@ nContextSendMessage(JNIEnv *_env, jobject _this, jlong con, jint id, jintArray d jint len = 0; if (data) { len = _env->GetArrayLength(data); - jint *ptr = _env->GetIntArrayElements(data, NULL); + ptr = _env->GetIntArrayElements(data, NULL); } LOG_API("nContextSendMessage, con(%p), id(%i), len(%i)", (RsContext)con, id, len); rsContextSendMessage((RsContext)con, id, (const uint8_t *)ptr, len * sizeof(int)); |