diff options
| author | Elliott Hughes <enh@google.com> | 2015-02-06 05:50:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-06 05:50:01 +0000 |
| commit | cf657ad46cab1c9124665e9afa6f2a89d33bba41 (patch) | |
| tree | fccc5da6081a7f8d51993efa64abe3e59f2150d9 /rs | |
| parent | 3968f0c2dfa5cbb1432d49af47ad2fa89f1b2225 (diff) | |
| parent | ae0bee53b84d4ffda84270852ace1841e13f5db8 (diff) | |
| download | frameworks_base-cf657ad46cab1c9124665e9afa6f2a89d33bba41.zip frameworks_base-cf657ad46cab1c9124665e9afa6f2a89d33bba41.tar.gz frameworks_base-cf657ad46cab1c9124665e9afa6f2a89d33bba41.tar.bz2 | |
am ae0bee53: am 81b84311: Merge "Fix clang build."
* commit 'ae0bee53b84d4ffda84270852ace1841e13f5db8':
Fix clang build.
Diffstat (limited to 'rs')
| -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 7387af0..b25dd41 100644 --- a/rs/jni/android_renderscript_RenderScript.cpp +++ b/rs/jni/android_renderscript_RenderScript.cpp @@ -1522,7 +1522,7 @@ static jlong nScriptInvokeIDCreate(JNIEnv *_env, jobject _this, jlong con, jlong sid, jint slot) { if (kLogApi) { - ALOGD("nScriptInvokeIDCreate, con(%p) script(%p), slot(%i), sig(%i)", (RsContext)con, + ALOGD("nScriptInvokeIDCreate, con(%p) script(%p), slot(%i)", (RsContext)con, (void *)sid, slot); } return (jlong)(uintptr_t)rsScriptInvokeIDCreate((RsContext)con, (RsScript)sid, slot); |