#include "base/android/jni_android.h"
#include "base/android/jni_registrar.h"
#include "base/android/jni_string.h"
-#include "base/at_exit.h"
#include "base/base_switches.h"
#include "base/command_line.h"
#include "base/debug/trace_event.h"
#include "base/files/file_path.h"
#include "base/logging.h"
-#include "base/metrics/histogram.h"
#include "base/strings/string_util.h"
#include "base/tracked_objects.h"
#include "content/app/android/app_jni_registrar.h"
#include "content/browser/android/browser_jni_registrar.h"
#include "content/child/android/child_jni_registrar.h"
#include "content/common/android/common_jni_registrar.h"
+#include "content/common/content_constants_internal.h"
#include "content/public/common/content_switches.h"
#include "content/public/common/result_codes.h"
-#include "jni/LibraryLoader_jni.h"
#include "media/base/android/media_jni_registrar.h"
#include "net/android/net_jni_registrar.h"
#include "ui/base/android/ui_base_jni_registrar.h"
namespace content {
-namespace {
-base::AtExitManager* g_at_exit_manager = NULL;
-const char* g_library_version_number = "";
-}
-
bool EnsureJniRegistered(JNIEnv* env) {
static bool g_jni_init_done = false;
return true;
}
-static jint LibraryLoaded(JNIEnv* env, jclass clazz,
+bool LibraryLoaded(JNIEnv* env, jclass clazz,
jobjectArray init_command_line) {
base::android::InitNativeCommandLineFromJavaArray(env, init_command_line);
base::debug::TraceLog::RECORD_UNTIL_FULL);
}
+ // Android's main browser loop is custom so we set the browser
+ // name here as early as possible.
+ TRACE_EVENT_BEGIN_ETW("BrowserMain", 0, "");
+ base::debug::TraceLog::GetInstance()->SetProcessName("Browser");
+ base::debug::TraceLog::GetInstance()->SetProcessSortIndex(
+ kTraceEventBrowserProcessSortIndex);
+
// Can only use event tracing after setting up the command line.
TRACE_EVENT0("jni", "JNI_OnLoad continuation");
VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel()
<< ", default verbosity = " << logging::GetVlogVerbosity();
- if (!EnsureJniRegistered(env))
- return RESULT_CODE_FAILED_TO_REGISTER_JNI;
-
- return 0;
-}
-
-static void RecordContentAndroidLinkerHistogram(
- JNIEnv* env,
- jclass clazz,
- jboolean loaded_at_fixed_address_failed,
- jboolean is_low_memory_device) {
- UMA_HISTOGRAM_BOOLEAN("ContentAndroidLinker.LoadedAtFixedAddressFailed",
- loaded_at_fixed_address_failed);
- UMA_HISTOGRAM_BOOLEAN("ContentAndroidLinker.IsLowMemoryDevice",
- is_low_memory_device);
-}
-
-void LibraryLoaderExitHook() {
- if (g_at_exit_manager) {
- delete g_at_exit_manager;
- g_at_exit_manager = NULL;
- }
-}
-
-bool RegisterLibraryLoaderEntryHook(JNIEnv* env) {
- // We need the AtExitManager to be created at the very beginning.
- g_at_exit_manager = new base::AtExitManager();
-
- return RegisterNativesImpl(env);
-}
-
-void SetVersionNumber(const char* version_number) {
- g_library_version_number = strdup(version_number);
-}
-
-jstring GetVersionNumber(JNIEnv* env, jclass clazz) {
- return env->NewStringUTF(g_library_version_number);
+ return EnsureJniRegistered(env);
}
} // namespace content