base/android/base_jni_registrar.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: base/android/base_jni_registrar.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: base/android/base_jni_registrar.cc

diff --git a/base/android/base_jni_registrar.cc b/base/android/base_jni_registrar.cc

index d4a6ee35387be8473498ee70b5a31cf3ecdbb3d3..9fd1dab06bbdfff5827afbe9ec58c66ea54bd3bb 100644

--- a/base/android/base_jni_registrar.cc

+++ b/base/android/base_jni_registrar.cc

@@ -6,7 +6,7 @@

#include "base/android/activity_status.h"

#include "base/android/build_info.h"

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

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

#include "base/android/content_uri_utils.h"

#include "base/android/cpu_features.h"

#include "base/android/important_file_writer_android.h"

« no previous file with comments | « no previous file | base/android/command_line.h » ('j') | no next file with comments »