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

Issue 62333025: [Android] Move CommandLine.java to base (Closed)

Created:
7 years, 1 month ago by jdduke (slow)
Modified:
7 years, 1 month ago
CC:
chromium-reviews, tim+watch_chromium.org, erikwright+watch_chromium.org, plundblad+watch_chromium.org, aboxhall+watch_chromium.org, jam, haitaol+watch_chromium.org, yuzo+watch_chromium.org, joi+watch-content_chromium.org, jochen+watch_chromium.org, darin-cc_chromium.org, dmazzoni+watch_chromium.org, dtseng+watch_chromium.org, rsimha+watch_chromium.org, android-webview-reviews_chromium.org, yoshiki+watch_chromium.org, David Trainor- moved to gerrit, aberent, benm (inactive), Torne
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Visibility:
Public.

Description

[Android] Move CommandLine.java to base The native CommandLine lives in base, and so too should the Java wrapper. Move CommandLine.java to base, updating all references and factoring out previously contained switches to BaseSwitches and ContentSwitches. BUG=320747 TBR=ajwong@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=236113

Patch Set 1 #

Total comments: 5

Patch Set 2 : Split CommandLineTest #

Total comments: 2

Patch Set 3 : Remove unused member variable #

Patch Set 4 : Rebase #

Patch Set 5 : Rebase #

Total comments: 1
Unified diffs Side-by-side diffs Delta from patch set Stats (+171 lines, -969 lines) Patch
M android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellApplication.java View 2 chunks +3 lines, -2 lines 0 comments Download
M base/android/base_jni_registrar.cc View 2 chunks +2 lines, -0 lines 0 comments Download
A + base/android/command_line.h View 1 chunk +14 lines, -5 lines 0 comments Download
A + base/android/command_line.cc View 6 chunks +10 lines, -4 lines 0 comments Download
A base/android/java/src/org/chromium/base/BaseSwitches.java View 1 chunk +17 lines, -0 lines 0 comments Download
A + base/android/java/src/org/chromium/base/CommandLine.java View 1 2 chunks +7 lines, -67 lines 0 comments Download
A + base/android/javatests/src/org/chromium/base/CommandLineTest.java View 1 2 5 chunks +2 lines, -71 lines 0 comments Download
M base/base.gyp View 1 2 1 chunk +1 line, -0 lines 0 comments Download
M base/base.gypi View 1 chunk +2 lines, -0 lines 1 comment Download
M chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java View 3 chunks +3 lines, -2 lines 0 comments Download
M chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellApplication.java View 1 chunk +1 line, -1 line 0 comments Download
M chrome/android/testshell/javatests/src/org/chromium/chrome/testshell/ChromiumTestShellTestBase.java View 1 chunk +1 line, -1 line 0 comments Download
M chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/sync/SyncTestUtil.java View 1 chunk +1 line, -1 line 0 comments Download
M content/app/android/library_loader_hooks.cc View 3 chunks +2 lines, -2 lines 0 comments Download
D content/common/android/command_line.h View 1 chunk +0 lines, -17 lines 0 comments Download
D content/common/android/command_line.cc View 1 chunk +0 lines, -79 lines 0 comments Download
M content/common/android/common_jni_registrar.cc View 2 chunks +0 lines, -2 lines 0 comments Download
M content/content_common.gypi View 1 chunk +0 lines, -2 lines 0 comments Download
M content/content_jni.gypi View 1 2 1 chunk +0 lines, -1 line 0 comments Download
M content/public/android/java/src/org/chromium/content/app/LibraryLoader.java View 1 chunk +1 line, -1 line 0 comments Download
M content/public/android/java/src/org/chromium/content/browser/ContentViewGestureHandler.java View 1 2 2 chunks +3 lines, -2 lines 0 comments Download
M content/public/android/java/src/org/chromium/content/browser/DeviceUtils.java View 2 chunks +4 lines, -3 lines 0 comments Download
M content/public/android/java/src/org/chromium/content/browser/HeapStatsLogger.java View 1 2 2 chunks +3 lines, -2 lines 0 comments Download
M content/public/android/java/src/org/chromium/content/browser/accessibility/AccessibilityInjector.java View 3 chunks +5 lines, -3 lines 0 comments Download
D content/public/android/java/src/org/chromium/content/common/CommandLine.java View 1 chunk +0 lines, -438 lines 0 comments Download
A content/public/android/java/src/org/chromium/content/common/ContentSwitches.java View 1 chunk +72 lines, -0 lines 0 comments Download
M content/public/android/java/src/org/chromium/content/common/TraceEvent.java View 2 chunks +3 lines, -1 line 0 comments Download
M content/public/android/javatests/src/org/chromium/content/browser/CommandLineTest.java View 1 1 chunk +0 lines, -199 lines 0 comments Download
A + content/public/android/javatests/src/org/chromium/content/browser/ContentCommandLineTest.java View 1 3 chunks +2 lines, -55 lines 0 comments Download
M content/public/android/javatests/src/org/chromium/content/browser/ImportantFileWriterAndroidTest.java View 1 chunk +1 line, -1 line 0 comments Download
M content/public/android/javatests/src/org/chromium/content/browser/PhoneNumberDetectionTest.java View 2 chunks +3 lines, -2 lines 0 comments Download
M content/shell/android/linker_test_apk/src/org/chromium/content_linker_test_apk/ContentLinkerTestActivity.java View 2 chunks +3 lines, -2 lines 0 comments Download
M content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java View 4 chunks +5 lines, -3 lines 0 comments Download

Messages

Total messages: 14 (0 generated)
jdduke (slow)
bulach@: PTAL. If you think this looks reasonable I'll move forward with further OWNER review, ...
7 years, 1 month ago (2013-11-18 19:04:21 UTC) #1
bulach
lgtm, thanks! I have small comments below, feel free to go once bots and other ...
7 years, 1 month ago (2013-11-18 19:25:52 UTC) #2
jdduke (slow)
https://codereview.chromium.org/62333025/diff/1/base/android/java/src/org/chromium/base/CommandLine.java File base/android/java/src/org/chromium/base/CommandLine.java (right): https://codereview.chromium.org/62333025/diff/1/base/android/java/src/org/chromium/base/CommandLine.java#newcode24 base/android/java/src/org/chromium/base/CommandLine.java:24: * adb shell "echo chrome --my-param > /data/local/chrome-command-line" On ...
7 years, 1 month ago (2013-11-18 19:53:33 UTC) #3
jdduke (slow)
PTAL. boliu@: android_webview/ brettw@: base/base.gyp{i}, content/content_common.gypi
7 years, 1 month ago (2013-11-18 20:02:33 UTC) #4
boliu
On 2013/11/18 20:02:33, jdduke wrote: > PTAL. > > boliu@: android_webview/ lgtm > brettw@: base/base.gyp{i}, ...
7 years, 1 month ago (2013-11-18 20:51:57 UTC) #5
bulach
still lgtm w/ nit: https://codereview.chromium.org/62333025/diff/70001/base/android/javatests/src/org/chromium/base/CommandLineTest.java File base/android/javatests/src/org/chromium/base/CommandLineTest.java (right): https://codereview.chromium.org/62333025/diff/70001/base/android/javatests/src/org/chromium/base/CommandLineTest.java#newcode32 base/android/javatests/src/org/chromium/base/CommandLineTest.java:32: private static boolean sInitialized = ...
7 years, 1 month ago (2013-11-19 12:18:08 UTC) #6
jdduke (slow)
https://codereview.chromium.org/62333025/diff/70001/base/android/javatests/src/org/chromium/base/CommandLineTest.java File base/android/javatests/src/org/chromium/base/CommandLineTest.java (right): https://codereview.chromium.org/62333025/diff/70001/base/android/javatests/src/org/chromium/base/CommandLineTest.java#newcode32 base/android/javatests/src/org/chromium/base/CommandLineTest.java:32: private static boolean sInitialized = false; On 2013/11/19 12:18:09, ...
7 years, 1 month ago (2013-11-19 16:32:56 UTC) #7
jdduke (slow)
PTAL for owner review, thanks. piman@: content/content_common.gypi ajwong@: base/base.gyp{i}
7 years, 1 month ago (2013-11-19 18:54:47 UTC) #8
piman
gyp changes LGTM
7 years, 1 month ago (2013-11-19 20:38:19 UTC) #9
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/jdduke@chromium.org/62333025/290001
7 years, 1 month ago (2013-11-19 21:28:44 UTC) #10
awong
base LGTM
7 years, 1 month ago (2013-11-20 01:26:40 UTC) #11
commit-bot: I haz the power
Change committed as 236113
7 years, 1 month ago (2013-11-20 03:01:11 UTC) #12
benm (inactive)
https://codereview.chromium.org/62333025/diff/290001/base/base.gypi File base/base.gypi (right): https://codereview.chromium.org/62333025/diff/290001/base/base.gypi#newcode42 base/base.gypi:42: 'android/command_line.cc', This new file has the same basename as ...
7 years, 1 month ago (2013-11-20 15:21:21 UTC) #13
jdduke (slow)
7 years, 1 month ago (2013-11-20 15:31:15 UTC) #14
Message was sent while issue was closed.
On 2013/11/20 15:21:21, benm wrote:
> https://codereview.chromium.org/62333025/diff/290001/base/base.gypi
> File base/base.gypi (right):
> 
> https://codereview.chromium.org/62333025/diff/290001/base/base.gypi#newcode42
> base/base.gypi:42: 'android/command_line.cc',
> This new file has the same basename as the one on line 115, and so GYP is
> failing downstream for Android WebView. I'm not sure why the AOSP bot didn't
> catch this... I think because the bots don't run with gyp in check syntax mode
> mode (http://code.google.com/p/chromium/issues/detail?id=228889)
> 
> 2013-11-20 15:08:51:Updating projects from gyp files...
> 2013-11-20 15:08:51:static library /.../base/base.gyp:base#target has several
> files with the same basename:
> 2013-11-20 15:08:51:  command_line: android/command_line.cc command_line.cc
> 2013-11-20 15:08:51:Some build systems, e.g. MSVC08, cannot handle that.

Right, fix is here https://codereview.chromium.org/77473002/

Powered by Google App Engine
This is Rietveld 408576698