Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(311)

Unified Diff: content/browser/android/library_loader_hooks.cc

Issue 10444113: Fixed the dependency. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync again Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/android/content_jni_registrar.cc ('k') | content/content_app.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/android/library_loader_hooks.cc
diff --git a/content/browser/android/library_loader_hooks.cc b/content/browser/android/library_loader_hooks.cc
deleted file mode 100644
index 30b266f82d1ab136adb2984010953d5a912847fa..0000000000000000000000000000000000000000
--- a/content/browser/android/library_loader_hooks.cc
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright (c) 2012 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.
-
-#include "content/public/browser/android_library_loader_hooks.h"
-
-#include "base/android/base_jni_registrar.h"
-#include "base/android/jni_registrar.h"
-#include "base/android/jni_android.h"
-#include "base/android/jni_string.h"
-#include "base/at_exit.h"
-#include "base/command_line.h"
-#include "base/debug/trace_event.h"
-#include "base/file_path.h"
-#include "base/file_util.h"
-#include "base/logging.h"
-#include "base/string_tokenizer.h"
-#include "base/string_util.h"
-#include "base/tracked_objects.h"
-#include "content/public/common/content_switches.h"
-#include "content/browser/android/command_line.h"
-#include "content/browser/android/content_jni_registrar.h"
-#include "media/base/android/media_jni_registrar.h"
-#include "net/android/net_jni_registrar.h"
-
-namespace {
-base::AtExitManager* g_at_exit_manager = NULL;
-}
-
-jboolean LibraryLoaderEntryHook(JNIEnv* env, jclass clazz,
- jobjectArray init_command_line) {
- // We need the Chrome AtExitManager to be created before we do any tracing or
- // logging.
- g_at_exit_manager = new base::AtExitManager();
- InitNativeCommandLineFromJavaArray(env, init_command_line);
-
- CommandLine* command_line = CommandLine::ForCurrentProcess();
-
- if (command_line->HasSwitch(switches::kTraceStartup)) {
- base::debug::TraceLog::GetInstance()->SetEnabled(
- command_line->GetSwitchValueASCII(switches::kTraceStartup));
- }
-
- // Can only use event tracing after setting up the command line.
- TRACE_EVENT0("jni", "JNI_OnLoad continuation");
-
- logging::InitLogging(NULL,
- logging::LOG_ONLY_TO_SYSTEM_DEBUG_LOG,
- logging::DONT_LOCK_LOG_FILE,
- logging::DELETE_OLD_LOG_FILE,
- logging::ENABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS);
- // To view log output with IDs and timestamps use "adb logcat -v threadtime".
- logging::SetLogItems(false, // Process ID
- false, // Thread ID
- false, // Timestamp
- false); // Tick count
- VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel()
- << ", default verbosity = " << logging::GetVlogVerbosity();
-
- if (!base::android::RegisterJni(env))
- return JNI_FALSE;
-
- if (!net::android::RegisterJni(env))
- return JNI_FALSE;
-
- if (!content::android::RegisterJni(env))
- return JNI_FALSE;
-
- if (!media::RegisterJni(env))
- return JNI_FALSE;
-
- return JNI_TRUE;
-}
-
-namespace content {
-
-void LibraryLoaderExitHook() {
- if (g_at_exit_manager) {
- delete g_at_exit_manager;
- g_at_exit_manager = NULL;
- }
-}
-
-bool RegisterLibraryLoaderEntryHook(JNIEnv* env) {
- // TODO(bulach): use the jni generator once we move jni_helper methods here.
- const JNINativeMethod kMethods[] = {
- { "nativeLibraryLoadedOnMainThread", "([Ljava/lang/String;)Z",
- reinterpret_cast<void*>(LibraryLoaderEntryHook) },
- };
- const int kMethodsSize = arraysize(kMethods);
- const char kLibraryLoaderPath[] =
- "org/chromium/content/browser/LibraryLoader";
- base::android::ScopedJavaLocalRef<jclass> clazz =
- base::android::GetClass(env, kLibraryLoaderPath);
-
- if (env->RegisterNatives(clazz.obj(),
- kMethods,
- kMethodsSize) < 0) {
- return false;
- }
- return true;
-}
-
-} // namespace content
« no previous file with comments | « content/browser/android/content_jni_registrar.cc ('k') | content/content_app.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698