base/base.gypi - 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/base.gypi

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/base.gypi

diff --git a/base/base.gypi b/base/base.gypi

index dc83d21366c13dfb9dc8bfba83ac828925049390..6807a38eccc67fa58e85c166bc88b4c2b30f64fc 100644

--- a/base/base.gypi

+++ b/base/base.gypi

@@ -39,8 +39,8 @@

'android/base_jni_registrar.h',

'android/build_info.cc',

'android/build_info.h',

- 'android/command_line.cc',

- 'android/command_line.h',

+ 'android/command_line_android.cc',

+ 'android/command_line_android.h',

'android/content_uri_utils.cc',

'android/content_uri_utils.h',

'android/cpu_features.cc',

« no previous file with comments | « base/android/command_line_android.cc ('k') | content/app/android/library_loader_hooks.cc » ('j') | no next file with comments »