content/app/android/library_loader_hooks.cc - Issue 77473002: [Android] Fix x86 compilation with multiply defined command_line.cc

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 77473002: [Android] Fix x86 compilation with multiply defined command_line.cc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 7 years, 1 month 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

« no previous file with comments | « base/base.gypi ('k') | no next file » | no next file with comments »

OLD	NEW
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.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"

11 #include "base/android/jni_string.h"	11 #include "base/android/jni_string.h"

12 #include "base/at_exit.h"	12 #include "base/at_exit.h"

13 #include "base/base_switches.h"	13 #include "base/base_switches.h"

14 #include "base/command_line.h"	14 #include "base/command_line.h"

15 #include "base/debug/trace_event.h"	15 #include "base/debug/trace_event.h"

16 #include "base/files/file_path.h"	16 #include "base/files/file_path.h"

17 #include "base/logging.h"	17 #include "base/logging.h"

18 #include "base/metrics/histogram.h"	18 #include "base/metrics/histogram.h"

(...skipping 121 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
140 }	140 }

141	141

142 bool RegisterLibraryLoaderEntryHook(JNIEnv* env) {	142 bool RegisterLibraryLoaderEntryHook(JNIEnv* env) {

143 // We need the AtExitManager to be created at the very beginning.	143 // We need the AtExitManager to be created at the very beginning.

144 g_at_exit_manager = new base::AtExitManager();	144 g_at_exit_manager = new base::AtExitManager();

145	145

146 return RegisterNativesImpl(env);	146 return RegisterNativesImpl(env);

147 }	147 }

148	148

149 } // namespace content	149 } // namespace content

OLD	NEW