diff options
| author | Elliott Hughes <enh@google.com> | 2015-02-06 05:37:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-02-06 05:37:33 +0000 |
| commit | 81b8431173837fe9ea21990948d6af30809fb056 (patch) | |
| tree | f3894a7ba669d73e354274b30c8a61115dc60209 | |
| parent | 1269ff961000c726247d510762e42b21562b8c2b (diff) | |
| parent | 7ff53fa0d42795da55b65468e07df82029deda79 (diff) | |
| download | frameworks_base-81b8431173837fe9ea21990948d6af30809fb056.zip frameworks_base-81b8431173837fe9ea21990948d6af30809fb056.tar.gz frameworks_base-81b8431173837fe9ea21990948d6af30809fb056.tar.bz2 | |
Merge "Fix clang build."
| -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); |