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

Side by Side Diff: content/app/android/library_loader_hooks.cc

Issue 99153011: Build fix after r242671 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 12 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/public/app/android_library_loader_hooks.h" 5 #include "content/public/app/android_library_loader_hooks.h"
6 6
7 #include "base/android/base_jni_registrar.h" 7 #include "base/android/base_jni_registrar.h"
8 #include "base/android/command_line_android.h" 8 #include "base/android/command_line_android.h"
9 #include "base/android/jni_android.h" 9 #include "base/android/jni_android.h"
10 #include "base/android/jni_registrar.h" 10 #include "base/android/jni_registrar.h"
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 static jint LibraryLoaded(JNIEnv* env, jclass clazz, 85 static jint LibraryLoaded(JNIEnv* env, jclass clazz,
86 jobjectArray init_command_line) { 86 jobjectArray init_command_line) {
87 base::android::InitNativeCommandLineFromJavaArray(env, init_command_line); 87 base::android::InitNativeCommandLineFromJavaArray(env, init_command_line);
88 88
89 CommandLine* command_line = CommandLine::ForCurrentProcess(); 89 CommandLine* command_line = CommandLine::ForCurrentProcess();
90 90
91 if (command_line->HasSwitch(switches::kTraceStartup)) { 91 if (command_line->HasSwitch(switches::kTraceStartup)) {
92 base::debug::CategoryFilter category_filter( 92 base::debug::CategoryFilter category_filter(
93 command_line->GetSwitchValueASCII(switches::kTraceStartup)); 93 command_line->GetSwitchValueASCII(switches::kTraceStartup));
94 base::debug::TraceLog::GetInstance()->SetEnabled(category_filter, 94 base::debug::TraceLog::GetInstance()->SetEnabled(category_filter,
95 base::debug::TraceLog::RECORDING_MODE,
95 base::debug::TraceLog::RECORD_UNTIL_FULL); 96 base::debug::TraceLog::RECORD_UNTIL_FULL);
96 } 97 }
97 98
98 // Can only use event tracing after setting up the command line. 99 // Can only use event tracing after setting up the command line.
99 TRACE_EVENT0("jni", "JNI_OnLoad continuation"); 100 TRACE_EVENT0("jni", "JNI_OnLoad continuation");
100 101
101 // Note: because logging is setup here right after copying the command line 102 // Note: because logging is setup here right after copying the command line
102 // array from java to native up top of this method, any code that adds the 103 // array from java to native up top of this method, any code that adds the
103 // --enable-dcheck switch must do so on the Java side. 104 // --enable-dcheck switch must do so on the Java side.
104 logging::LoggingSettings settings; 105 logging::LoggingSettings settings;
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 150
150 void SetVersionNumber(const char* version_number) { 151 void SetVersionNumber(const char* version_number) {
151 g_library_version_number = strdup(version_number); 152 g_library_version_number = strdup(version_number);
152 } 153 }
153 154
154 jstring GetVersionNumber(JNIEnv* env, jclass clazz) { 155 jstring GetVersionNumber(JNIEnv* env, jclass clazz) {
155 return env->NewStringUTF(g_library_version_number); 156 return env->NewStringUTF(g_library_version_number);
156 } 157 }
157 158
158 } // namespace content 159 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698