Fix conversions from 32-bit pointers to signed 64-bit integers.

base/android/linker/linker_jni.cc

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..a3a54461729aa3674ee63c7b337316b01070fb2a 100644
--- a/base/android/linker/linker_jni.cc
+++ b/base/android/linker/linker_jni.cc
@@ -23,7 +23,7 @@
 // Set this to 1 to enable debug traces to the Android log.
 // Note that LOG() from "base/logging.h" cannot be used, since it is
 // in base/ which hasn't been loaded yet.
-#define DEBUG 0
+#define DEBUG 1

[Yaron, 2014/09/03 14:24:56]

revert

[whywhat, 2014/09/03 14:40:28]

Done.

 
 #define TAG "chromium_android_linker"
 
@@ -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[] = {