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

Issue 77473002: [Android] Fix x86 compilation with multiply defined command_line.cc (Closed)

Created:
7 years, 1 month ago by jdduke (slow)
Modified:
7 years, 1 month ago
Reviewers:
bulach, awong
CC:
chromium-reviews, joi+watch-content_chromium.org, darin-cc_chromium.org, erikwright+watch_chromium.org, jam
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Visibility:
Public.

Description

[Android] Fix x86 compilation with multiply defined command_line.cc Multiple .cc files cannot be defined in a given compilation unit for x86 Android Android builds. Rename base/android's command_line.{h,cc} to command_line_android.{h,cc}. NOTRY=true Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=236257

Patch Set 1 #

Patch Set 2 : Rebase #

Unified diffs Side-by-side diffs Delta from patch set Stats (+8 lines, -119 lines) Patch
M base/android/base_jni_registrar.cc View 1 1 chunk +1 line, -1 line 0 comments Download
D base/android/command_line.h View 1 chunk +0 lines, -26 lines 0 comments Download
D base/android/command_line.cc View 1 chunk +0 lines, -85 lines 0 comments Download
A + base/android/command_line_android.h View 2 chunks +3 lines, -3 lines 0 comments Download
A + base/android/command_line_android.cc View 1 chunk +1 line, -1 line 0 comments Download
M base/base.gypi View 1 1 chunk +2 lines, -2 lines 0 comments Download
M content/app/android/library_loader_hooks.cc View 1 chunk +1 line, -1 line 0 comments Download

Messages

Total messages: 6 (0 generated)
jdduke (slow)
bulach@: PTAL. I should have checked an x86 trybot earlier, as this appears to have ...
7 years, 1 month ago (2013-11-20 03:51:55 UTC) #1
bulach
lgtm, sorry I didn't catch this earlier, glad to know. :)
7 years, 1 month ago (2013-11-20 09:39:52 UTC) #2
jdduke (slow)
ajwong@: Review for base/base.gypi? Thanks.
7 years, 1 month ago (2013-11-20 15:34:27 UTC) #3
awong
base LGTM
7 years, 1 month ago (2013-11-20 15:52:08 UTC) #4
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/jdduke@chromium.org/77473002/110001
7 years, 1 month ago (2013-11-20 16:48:12 UTC) #5
commit-bot: I haz the power
7 years, 1 month ago (2013-11-20 16:52:52 UTC) #6
Message was sent while issue was closed.
Change committed as 236257

Powered by Google App Engine
This is Rietveld 408576698