summaryrefslogtreecommitdiffstats
path: root/remoting/remoting_enable.gypi
diff options
context:
space:
mode:
authorgarykac <garykac@chromium.org>2015-02-10 15:15:38 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-10 23:17:15 +0000
commit8cf0b120a69d45e17f3cb3b8b91ec0a7d3967af3 (patch)
treede42d5df9b24961fb1bc853b03da38255e3bc6f2 /remoting/remoting_enable.gypi
parentd67d3f49f99d88cdd3d43d6e2ec418412655cf91 (diff)
downloadchromium_src-8cf0b120a69d45e17f3cb3b8b91ec0a7d3967af3.zip
chromium_src-8cf0b120a69d45e17f3cb3b8b91ec0a7d3967af3.tar.gz
chromium_src-8cf0b120a69d45e17f3cb3b8b91ec0a7d3967af3.tar.bz2
[Chromoting] Re-land Remove wildcard ('*') from remoting_all target
This is a re-land of crrev.com/896743004/, which was reverted in crrev.com/905223002/ Previous build problem was due to some linux variables being defined by a script which in turn had some dependencies on dpkg-architecture (which is not present for all linux builds). Fix is to move the var definitions in with the targets. BUG= Review URL: https://codereview.chromium.org/906463005 Cr-Commit-Position: refs/heads/master@{#315670}
Diffstat (limited to 'remoting/remoting_enable.gypi')
-rw-r--r--remoting/remoting_enable.gypi24
1 files changed, 24 insertions, 0 deletions
diff --git a/remoting/remoting_enable.gypi b/remoting/remoting_enable.gypi
new file mode 100644
index 0000000..8964f6c
--- /dev/null
+++ b/remoting/remoting_enable.gypi
@@ -0,0 +1,24 @@
+# Copyright 2015 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+ 'variables': {
+ 'enable_remoting_host%': 0,
+ 'enable_me2me_host%': 0,
+
+ 'conditions': [
+ ['OS=="win" or OS=="mac"', {
+ 'enable_remoting_host': 1,
+ 'enable_me2me_host': 1,
+ }],
+ ['OS=="linux" and chromeos==0 and use_x11==1', {
+ 'enable_remoting_host': 1,
+ 'enable_me2me_host': 1,
+ }],
+ ['OS=="linux" and chromeos==1', {
+ 'enable_remoting_host': 1,
+ }],
+ ], # end of conditions
+ }, # end of variables
+}