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

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

Unified 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 side-by-side diff with in-line comments

Download patch

Index: content/app/android/library_loader_hooks.cc

diff --git a/content/app/android/library_loader_hooks.cc b/content/app/android/library_loader_hooks.cc

index 90a27c05950aea99574312f02905b169f7f8e28d..7ae89e6a308f3fdba4fd7a3f9062c8b8bb8518f6 100644

--- a/content/app/android/library_loader_hooks.cc

+++ b/content/app/android/library_loader_hooks.cc

@@ -5,7 +5,7 @@

#include "content/public/app/android_library_loader_hooks.h"

#include "base/android/base_jni_registrar.h"

-#include "base/android/command_line.h"

+#include "base/android/command_line_android.h"

#include "base/android/jni_android.h"

#include "base/android/jni_registrar.h"

#include "base/android/jni_string.h"

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