diff options
| author | petermayo <petermayo@chromium.org> | 2015-09-04 16:00:41 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-04 23:01:13 +0000 |
| commit | 0d2ee9b94b2973ab266f663dc3a535d2d7ab9509 (patch) | |
| tree | 73629a1f8c8e441fca6068ba4843a91ac57af102 /remoting | |
| parent | 76a40f98082e9cc63416bf1722eb2dabc65880f5 (diff) | |
| download | chromium_src-0d2ee9b94b2973ab266f663dc3a535d2d7ab9509.zip chromium_src-0d2ee9b94b2973ab266f663dc3a535d2d7ab9509.tar.gz chromium_src-0d2ee9b94b2973ab266f663dc3a535d2d7ab9509.tar.bz2 | |
Gate gtk on chromeos.
We shouldn't use GTK in even the chromeos testing environment.
It breaks to even reference it in the chroot building env, since
the packages are not available.
BUG=527996
TEST=set gn args, gn gen
Review URL: https://codereview.chromium.org/1319843004
Cr-Commit-Position: refs/heads/master@{#347519}
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/host/BUILD.gn | 6 | ||||
| -rw-r--r-- | remoting/host/it2me/BUILD.gn | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/remoting/host/BUILD.gn b/remoting/host/BUILD.gn index 3605c8e..57a1f59 100644 --- a/remoting/host/BUILD.gn +++ b/remoting/host/BUILD.gn @@ -90,7 +90,7 @@ if (is_mac) { # TODO(GYP) Mac build of remoting host. "//build/config/linux:x11", "//build/config/linux:xrandr", ] - if (!is_chromeos) { + if (is_desktop_linux) { deps += [ "//build/config/linux/gtk2" ] } } else { @@ -452,10 +452,10 @@ if (is_mac) { # TODO(GYP) Mac build of remoting host. deps += [ "//third_party/libjingle:libjingle_webrtc" ] } - if (is_linux) { + if (is_desktop_linux) { deps += [ "//build/config/linux/gtk2" ] } - if (is_linux || is_mac) { + if ((is_linux && !is_chromeos) || is_mac) { libs = [ "pam" ] } } diff --git a/remoting/host/it2me/BUILD.gn b/remoting/host/it2me/BUILD.gn index 2706d87..5c1a5f1 100644 --- a/remoting/host/it2me/BUILD.gn +++ b/remoting/host/it2me/BUILD.gn @@ -53,7 +53,7 @@ if (!is_win && enable_remoting_host) { deps += [ "//third_party/libjingle:libjingle_webrtc" ] } - if (is_linux) { + if (is_desktop_linux) { deps += [ "//build/config/linux/gtk2" ] } } |