diff options
| author | kerz <kerz@chromium.org> | 2015-01-22 12:28:09 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-22 20:30:06 +0000 |
| commit | a98f15b7d247d2d22a9b363380b333ca20597858 (patch) | |
| tree | 33f7175d79c7a364954275a4d5a23e08a945e563 /chrome/android | |
| parent | aa84c86b914e7835e8810c56cc6236fad5c54d0b (diff) | |
| download | chromium_src-a98f15b7d247d2d22a9b363380b333ca20597858.zip chromium_src-a98f15b7d247d2d22a9b363380b333ca20597858.tar.gz chromium_src-a98f15b7d247d2d22a9b363380b333ca20597858.tar.bz2 | |
Add com.chrome.work as supported channel.
R=newt@chromium.org
BUG=450754
Review URL: https://codereview.chromium.org/863033004
Cr-Commit-Position: refs/heads/master@{#312671}
Diffstat (limited to 'chrome/android')
| -rw-r--r-- | chrome/android/channel.gni | 6 | ||||
| -rw-r--r-- | chrome/android/java/ChromeVersionConstants.java.version | 1 | ||||
| -rw-r--r-- | chrome/android/java/src/org/chromium/chrome/browser/ChromeVersionInfo.java | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/chrome/android/channel.gni b/chrome/android/channel.gni index 14e63a0..397f83a 100644 --- a/chrome/android/channel.gni +++ b/chrome/android/channel.gni @@ -3,12 +3,12 @@ # found in the LICENSE file. declare_args() { - # The channel to build on Android: stable, beta, dev, canary, or default. - # "default" should be used on non-official builds. + # The channel to build on Android: stable, beta, dev, canary, work, or + # default. "default" should be used on non-official builds. android_channel = "default" } assert(android_channel == "default" || android_channel == "canary" || android_channel == "dev" || android_channel == "beta" || - android_channel == "stable", + android_channel == "stable" || android_channel == "work", "Invalid channel: " + android_channel) diff --git a/chrome/android/java/ChromeVersionConstants.java.version b/chrome/android/java/ChromeVersionConstants.java.version index 83b9a11..81e981e 100644 --- a/chrome/android/java/ChromeVersionConstants.java.version +++ b/chrome/android/java/ChromeVersionConstants.java.version @@ -14,5 +14,6 @@ class ChromeVersionConstants { static final int CHANNEL_DEV = 2; static final int CHANNEL_BETA = 3; static final int CHANNEL_STABLE = 4; + static final int CHANNEL_WORK = 5; static final int CHANNEL = CHANNEL_@CHANNEL@; } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeVersionInfo.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeVersionInfo.java index d722c01..1c778c7 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeVersionInfo.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeVersionInfo.java @@ -42,7 +42,8 @@ public class ChromeVersionInfo { * @return Whether this build is a stable build. */ public static boolean isStableBuild() { - return ChromeVersionConstants.CHANNEL == ChromeVersionConstants.CHANNEL_STABLE; + return ChromeVersionConstants.CHANNEL == ChromeVersionConstants.CHANNEL_STABLE + || ChromeVersionConstants.CHANNEL == ChromeVersionConstants.CHANNEL_WORK; } /** |