diff options
| author | Elliott Hughes <enh@google.com> | 2015-09-24 10:01:32 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2015-09-24 10:01:32 -0700 |
| commit | b57dd722f1dc0663417da37d3a82f8283ad3c982 (patch) | |
| tree | 49aec7f0e7b4bd68998dfcd78e83f9eb731f8ba1 /rs/jni/android_renderscript_RenderScript.cpp | |
| parent | aa31169804dffa3b36654ccffe67a53f6ff4cdaf (diff) | |
| parent | a884d81e8675505d86569e034e83ca267c12a6a8 (diff) | |
resolved conflicts for a884d81e to stage-aosp-master
Change-Id: Ice485967fa96f13786024b6939b826638e906ff0
Diffstat (limited to 'rs/jni/android_renderscript_RenderScript.cpp')
| -rw-r--r-- | rs/jni/android_renderscript_RenderScript.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rs/jni/android_renderscript_RenderScript.cpp b/rs/jni/android_renderscript_RenderScript.cpp index 0419d33c686c..8c830e8d9257 100644 --- a/rs/jni/android_renderscript_RenderScript.cpp +++ b/rs/jni/android_renderscript_RenderScript.cpp @@ -2494,7 +2494,7 @@ nSystemGetPointerSize(JNIEnv *_env, jobject _this) { static const char *classPathName = "android/renderscript/RenderScript"; -static JNINativeMethod methods[] = { +static const JNINativeMethod methods[] = { {"_nInit", "()V", (void*)_nInit }, {"nDeviceCreate", "()J", (void*)nDeviceCreate }, |