Chromium Code Reviews| Index: build/config/BUILDCONFIG.gn |
| diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn |
| index c91db167b34dcc8adcd98dab2e09835599b89727..cba5fbb1b52915cd6241ce6e0ad6cfdd3a1530a3 100644 |
| --- a/build/config/BUILDCONFIG.gn |
| +++ b/build/config/BUILDCONFIG.gn |
| @@ -125,8 +125,11 @@ declare_args() { |
| # Debug build. |
| is_debug = true |
| + # Whether we're using a chromeos user interface. |
| + is_chromeos_ui = current_os == "chromeos" |
|
brettw
2015/08/13 19:55:49
Given the below definition for is_chromeos, having
|
| + |
| # Whether we're a traditional desktop unix. |
| - is_desktop_linux = current_os == "linux" && current_os != "chromeos" |
| + is_desktop_linux = current_os == "linux" && !is_chromeos_ui |
| # Set to true when compiling with the Clang compiler. Typically this is used |
| # to configure warnings. |
| @@ -162,7 +165,7 @@ 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_chromeos_os, is_ios, and is_win should be obvious. |
|
brettw
2015/08/13 19:55:49
In this case, is_chromeos_os isn't so obvious, I t
|
| # - 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). |
| @@ -176,7 +179,7 @@ declare_args() { |
| if (current_os == "win" || current_os == "winrt_81" || |
| current_os == "winrt_81_phone" || current_os == "winrt_10") { |
| is_android = false |
| - is_chromeos = false |
| + is_chromeos_os = false |
| is_ios = false |
| is_linux = false |
| is_mac = false |
| @@ -185,7 +188,7 @@ if (current_os == "win" || current_os == "winrt_81" || |
| is_win = true |
| } else if (current_os == "mac") { |
| is_android = false |
| - is_chromeos = false |
| + is_chromeos_os = false |
| is_ios = false |
| is_linux = false |
| is_mac = true |
| @@ -194,7 +197,7 @@ if (current_os == "win" || current_os == "winrt_81" || |
| is_win = false |
| } else if (current_os == "android") { |
| is_android = true |
| - is_chromeos = false |
| + is_chromeos_os = false |
| is_ios = false |
| is_linux = false |
| is_mac = false |
| @@ -203,7 +206,8 @@ if (current_os == "win" || current_os == "winrt_81" || |
| is_win = false |
| } else if (current_os == "chromeos") { |
| is_android = false |
| - is_chromeos = true |
| + assert(is_chromeos_ui, "ChromiumOS requires is_chromeos_ui.") |
| + is_chromeos_os = true |
| is_ios = false |
| is_linux = true |
| is_mac = false |
| @@ -215,7 +219,7 @@ if (current_os == "win" || current_os == "winrt_81" || |
| # It is not set by default or on the command line. We treat is as a |
| # Posix variant. |
| is_android = false |
| - is_chromeos = false |
| + is_chromeos_os = false |
| is_ios = false |
| is_linux = false |
| is_mac = false |
| @@ -224,7 +228,7 @@ if (current_os == "win" || current_os == "winrt_81" || |
| is_win = false |
| } else if (current_os == "ios") { |
| is_android = false |
| - is_chromeos = false |
| + is_chromeos_os = false |
| is_ios = true |
| is_linux = false |
| is_mac = false |
| @@ -233,7 +237,7 @@ if (current_os == "win" || current_os == "winrt_81" || |
| is_win = false |
| } else if (current_os == "linux") { |
| is_android = false |
| - is_chromeos = false |
| + is_chromeos_os = false |
| is_ios = false |
| is_linux = true |
| is_mac = false |
| @@ -242,6 +246,11 @@ if (current_os == "win" || current_os == "winrt_81" || |
| is_win = false |
| } |
| +# This is for backwards compatability until the rename in complete in all |
| +# dependent files. |
| +# TODO(petermayo): Remove this when it doesn't break known compiles. |
| +is_chromeos = is_chromeos_ui |
| + |
| # ============================================================================= |
| # SOURCES FILTERS |
| # ============================================================================= |
| @@ -328,7 +337,7 @@ if (!is_android) { |
| "*\bandroid/*", |
| ] |
| } |
| -if (!is_chromeos) { |
| +if (!is_chromeos_ui) { |
|
Peter Mayo
2015/08/18 19:54:14
Is it useful to make this filter only available fr
|
| sources_assignment_filter += [ |
| "*_chromeos.h", |
| "*_chromeos.cc", |