Index: base/android/linker/linker_jni.cc |
diff --git a/base/android/linker/linker_jni.cc b/base/android/linker/linker_jni.cc |
index 4eb774b69ab9fd88e38022f0192787bee9a6177f..79dd20103e7add06b2b30dd0550193682cbb7d50 100644 |
--- a/base/android/linker/linker_jni.cc |
+++ b/base/android/linker/linker_jni.cc |
@@ -452,7 +452,8 @@ static bool PostForLaterExecution(crazy_callback_t* callback_request, |
LOG_INFO("%s: Calling back to java with handler %p, opaque %p", |
__FUNCTION__, callback->handler, callback->opaque); |
- jlong arg = static_cast<jlong>(reinterpret_cast<intptr_t>(callback)); |
+ jlong arg = static_cast<jlong>(reinterpret_cast<uintptr_t>(callback)); |
+ |
env->CallStaticVoidMethod( |
s_java_callback_bindings.clazz, s_java_callback_bindings.method_id, arg); |
@@ -570,7 +571,7 @@ jlong GetRandomBaseLoadAddress(JNIEnv* env, jclass clazz, jlong bytes) { |
} |
munmap(address, bytes); |
LOG_INFO("%s: Random base load address is %p\n", __FUNCTION__, address); |
- return static_cast<jlong>(reinterpret_cast<intptr_t>(address)); |
+ return static_cast<jlong>(reinterpret_cast<uintptr_t>(address)); |
} |
const JNINativeMethod kNativeMethods[] = { |