Update to Chromium //base at Chromium commit 3e81715e6d3a4324362635aea46ce1f1a163cca1.

android/linker/modern_linker_jni.cc

Index: android/linker/modern_linker_jni.cc
diff --git a/android/linker/modern_linker_jni.cc b/android/linker/modern_linker_jni.cc
index 86616360fe0bbd14efdb86587d96b69ead5f12c4..afbad35648dda1df86f2c7f5cd29840818eaf0f5 100644
--- a/android/linker/modern_linker_jni.cc
+++ b/android/linker/modern_linker_jni.cc
@@ -44,21 +44,21 @@ static JavaVM* s_java_vm = nullptr;
 // Returns the CPU ABI string for which the linker is running.
 jstring GetCpuAbi(JNIEnv* env, jclass clazz) {
 #if defined(__arm__) && defined(__ARM_ARCH_7A__)
-  static const char* kCurrentABI = "armeabi-v7a";
+  static const char* kCurrentAbi = "armeabi-v7a";
 #elif defined(__arm__)
-  static const char* kCurrentABI = "armeabi";
+  static const char* kCurrentAbi = "armeabi";
 #elif defined(__i386__)
-  static const char* kCurrentABI = "x86";
+  static const char* kCurrentAbi = "x86";
 #elif defined(__mips__)
-  static const char* kCurrentABI = "mips";
+  static const char* kCurrentAbi = "mips";
 #elif defined(__x86_64__)
-  static const char* kCurrentABI = "x86_64";
+  static const char* kCurrentAbi = "x86_64";
 #elif defined(__aarch64__)
-  static const char* kCurrentABI = "arm64-v8a";
+  static const char* kCurrentAbi = "arm64-v8a";
 #else
 #error "Unsupported target abi"
 #endif
-  return env->NewStringUTF(kCurrentABI);
+  return env->NewStringUTF(kCurrentAbi);
 }
 
 // Convenience wrapper around dlsym() on the main executable. Returns
@@ -141,8 +141,8 @@ bool AndroidDlopenExt(const char* filename,
   LOG_INFO(
       "android_dlopen_ext:"
       " flags=0x%llx, reserved_addr=%p, reserved_size=%d, relro_fd=%d",
-      extinfo->flags, extinfo->reserved_addr, extinfo->reserved_size,
-      extinfo->relro_fd);
+      static_cast<long long>(extinfo->flags), extinfo->reserved_addr,
+      static_cast<int>(extinfo->reserved_size), extinfo->relro_fd);
 
   *status = (*function_ptr)(filename, flag, extinfo);
   return true;
@@ -237,7 +237,8 @@ ScopedAnonymousMmap::ScopedAnonymousMmap(void* addr, size_t size) {
     addr = reinterpret_cast<void*>(reinterpret_cast<uintptr_t>(addr) -
                                    kBreakpadGuardRegionBytes);
   }
-  LOG_INFO("Added %d to size, for Breakpad guard", kBreakpadGuardRegionBytes);
+  LOG_INFO("Added %d to size, for Breakpad guard",
+           static_cast<int>(kBreakpadGuardRegionBytes));
 #endif
 
   addr_ = mmap(addr, size, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
@@ -292,8 +293,8 @@ bool GetLibraryLoadSize(void* addr, size_t* load_size) {
 bool ResizeReservedAddressSpace(void* addr,
                                 size_t reserved_size,
                                 size_t load_size) {
-  LOG_INFO("Called for %p, reserved %d, loaded %d", addr, reserved_size,
-           load_size);
+  LOG_INFO("Called for %p, reserved %d, loaded %d", addr,
+           static_cast<int>(reserved_size), static_cast<int>(load_size));
 
   if (reserved_size < load_size) {
     LOG_ERROR("WARNING: library reservation was too small");