From 8cf0b120a69d45e17f3cb3b8b91ec0a7d3967af3 Mon Sep 17 00:00:00 2001 From: garykac Date: Tue, 10 Feb 2015 15:15:38 -0800 Subject: [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} --- remoting/remoting_enable.gypi | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 remoting/remoting_enable.gypi (limited to 'remoting/remoting_enable.gypi') 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 +} -- cgit v1.1