Move the android library loader from content to base

base/android/linker/linker_jni.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// This is the Android-specific content linker, a tiny shared library
+// This is the Android-specific Chromium linker, a tiny shared library
 // implementing a custom dynamic linker that can be used to load the
-// real content-based libraries (e.g. libcontentshell.so).
+// real Chromium libraries (e.g. libcontentshell.so).
 
 // The main point of this linker is to be able to share the RELRO
 // section of libcontentshell.so (or equivalent) between the browser and
 // renderer process.
 
 // This source code *cannot* depend on anything from base/ or the C++
 // STL, to keep the final library small, and avoid ugly dependency issues.
 
 #include <android/log.h>
 #include <crazy_linker.h>
 #include <jni.h>
 #include <stdlib.h>
 #include <unistd.h>
 
 // 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 TAG "content_android_linker"
+#define TAG "chromium_android_linker"
 
 #if DEBUG
 #define LOG_INFO(...) __android_log_print(ANDROID_LOG_INFO, TAG, __VA_ARGS__)
 #define LOG_ERROR(...) __android_log_print(ANDROID_LOG_ERROR, TAG, __VA_ARGS__)
 #else
 #define LOG_INFO(...) ((void)0)
 #define LOG_ERROR(...) ((void)0)
 #endif
 
 #define UNUSED __attribute__((unused))
@@ skipping 109 matching lines @@
   jfieldID load_address_id;
   jfieldID load_size_id;
   jfieldID relro_start_id;
   jfieldID relro_size_id;
   jfieldID relro_fd_id;
 
   // Initialize an instance.
   bool Init(JNIEnv* env) {
     jclass clazz;
     if (!InitClassReference(
-             env, "org/chromium/content/app/Linker$LibInfo", &clazz)) {
+             env, "org/chromium/base/library_loader/Linker$LibInfo", &clazz)) {
       return false;
     }
 
     return InitFieldId(env, clazz, "mLoadAddress", "J", &load_address_id) &&
            InitFieldId(env, clazz, "mLoadSize", "J", &load_size_id) &&
            InitFieldId(env, clazz, "mRelroStart", "J", &relro_start_id) &&
            InitFieldId(env, clazz, "mRelroSize", "J", &relro_size_id) &&
            InitFieldId(env, clazz, "mRelroFd", "I", &relro_fd_id);
   }
 
@@ skipping 46 matching lines @@
 
     // Ensure libraries located in the same directory as the linker
     // can be loaded before system ones.
     crazy_context_add_search_path_for_address(
         s_crazy_context, reinterpret_cast<void*>(&s_crazy_context));
   }
 
   return s_crazy_context;
 }
 
-// Load a library with the content linker. This will also call its
+// Load a library with the chromium linker. This will also call its
 // JNI_OnLoad() method, which shall register its methods. Note that
 // lazy native method resolution will _not_ work after this, because
 // Dalvik uses the system's dlsym() which won't see the new library,
 // so explicit registration is mandatory.
 // |env| is the current JNI environment handle.
 // |clazz| is the static class handle for org.chromium.base.Linker,
 // and is ignored here.
 // |library_name| is the library name (e.g. libfoo.so).
 // |load_address| is an explicit load address.
 // |library_info| is a LibInfo handle used to communicate information
@@ skipping 145 matching lines @@
   jlong result = static_cast<jlong>(sysconf(_SC_PAGESIZE));
   LOG_INFO("%s: System page size is %lld bytes\n", __FUNCTION__, result);
   return result;
 }
 
 const JNINativeMethod kNativeMethods[] = {
     {"nativeLoadLibrary",
      "("
      "Ljava/lang/String;"
      "J"
-     "Lorg/chromium/content/app/Linker$LibInfo;"
+     "Lorg/chromium/base/library_loader/Linker$LibInfo;"
      ")"
      "Z",
      reinterpret_cast<void*>(&LoadLibrary)},
     {"nativeCreateSharedRelro",
      "("
      "Ljava/lang/String;"
      "J"
-     "Lorg/chromium/content/app/Linker$LibInfo;"
+     "Lorg/chromium/base/library_loader/Linker$LibInfo;"
      ")"
      "Z",
      reinterpret_cast<void*>(&CreateSharedRelro)},
     {"nativeUseSharedRelro",
      "("
      "Ljava/lang/String;"
-     "Lorg/chromium/content/app/Linker$LibInfo;"
+     "Lorg/chromium/base/library_loader/Linker$LibInfo;"
      ")"
      "Z",
      reinterpret_cast<void*>(&UseSharedRelro)},
     {"nativeCanUseSharedRelro",
      "("
      ")"
      "Z",
      reinterpret_cast<void*>(&CanUseSharedRelro)},
     {"nativeGetPageSize",
      "("
@@ skipping 11 matching lines @@
   // Get new JNIEnv
   JNIEnv* env;
   if (JNI_OK != vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_4)) {
     LOG_ERROR("Could not create JNIEnv");
     return -1;
   }
 
   // Register native methods.
   jclass linker_class;
   if (!InitClassReference(
-           env, "org/chromium/content/app/Linker", &linker_class))
+           env, "org/chromium/base/library_loader/Linker", &linker_class))
     return -1;
 
   LOG_INFO("%s: Registering native methods", __FUNCTION__);
   env->RegisterNatives(linker_class,
                        kNativeMethods,
                        sizeof(kNativeMethods) / sizeof(kNativeMethods[0]));
 
   // Find LibInfo field ids.
   LOG_INFO("%s: Caching field IDs", __FUNCTION__);
   if (!s_lib_info_fields.Init(env)) {
     return -1;
   }
 
   // Save JavaVM* handle into context.
   crazy_context_t* context = GetCrazyContext();
   crazy_context_set_java_vm(context, vm, JNI_VERSION_1_4);
 
   LOG_INFO("%s: Done", __FUNCTION__);
   return JNI_VERSION_1_4;
 }