Chromium Code Reviews| Index: build/config/BUILDCONFIG.gn |
| diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn |
| index 5be9716aaf05f031381f27e6e0d243d59901e94e..214456d3615bafe93135ec44182d5c74a1ca2c94 100644 |
| --- a/build/config/BUILDCONFIG.gn |
| +++ b/build/config/BUILDCONFIG.gn |
| @@ -94,12 +94,11 @@ declare_args() { |
| is_debug = true |
| # Whether we're a traditional desktop unix. |
| - is_desktop_linux = current_os == "linux" && current_os != "chromeos" |
| + is_desktop_linux = current_os == "linux" |
|
viettrungluu
2016/01/12 22:47:11
We should probably get rid of "is_desktop_linux" i
Petr Hosek
2016/01/13 00:35:54
I'll do that in a separate change.
|
| # Set to true when compiling with the Clang compiler. Typically this is used |
| # to configure warnings. |
| - is_clang = current_os == "mac" || current_os == "ios" || |
| - current_os == "linux" || current_os == "chromeos" |
| + is_clang = current_os == "mac" || current_os == "ios" || current_os == "linux" |
| # By default, assume a non-PNaCl toolchain. |
| is_pnacl = false |
| @@ -128,13 +127,6 @@ declare_args() { |
| # Compile for Thread Sanitizer to find threading bugs. |
| is_tsan = false |
| - if (current_os == "chromeos") { |
| - # Allows the target toolchain to be injected as arguments. This is needed |
| - # to support the CrOS build system which supports per-build-configuration |
| - # toolchains. |
| - cros_use_custom_toolchain = false |
| - } |
| - |
| # DON'T ADD MORE FLAGS HERE. Read the comment above. |
| } |
| @@ -145,11 +137,11 @@ declare_args() { |
| # We set these various is_FOO booleans for convenience in writing OS-based |
| # conditions. |
| # |
| -# - is_android, is_chromeos, is_ios, and is_win should be obvious. |
| +# - is_android, is_ios, and is_win should be obvious. |
| # - is_mac is set only for desktop Mac. It is not set on iOS. |
| # - is_posix is true for mac and any Unix-like system (basically everything |
| # except Windows). |
| -# - is_linux is true for desktop Linux and ChromeOS, but not Android (which is |
| +# - is_linux is true for desktop Linux, but not Android (which is |
| # generally too different despite being based on the Linux kernel). |
| # |
| # Do not add more is_* variants here for random lesser-used Unix systems like |
| @@ -176,16 +168,6 @@ if (current_os == "mac") { |
| is_nacl = false |
| is_posix = true |
| is_win = false |
| -} else if (current_os == "chromeos") { |
| - is_android = false |
| - is_chromeos = true |
| - is_fnl = false |
| - is_ios = false |
| - is_linux = true |
| - is_mac = false |
| - is_nacl = false |
| - is_posix = true |
| - is_win = false |
| } else if (current_os == "nacl") { |
| # current_os == "nacl" will be passed by the nacl toolchain definition. |
| # It is not set by default or on the command line. We treat is as a |
| @@ -557,9 +539,6 @@ if (is_android) { |
| host_toolchain = "//build/toolchain/linux:$host_cpu" |
| set_default_toolchain("//build/toolchain/linux:$current_cpu") |
| } |
| - if (is_chromeos && cros_use_custom_toolchain) { |
| - set_default_toolchain("//build/toolchain/cros:target") |
| - } |
| if (is_fnl) { |
| set_default_toolchain("//build/toolchain/fnl:target") |
| } |