summaryrefslogtreecommitdiffstats
path: root/remoting/remoting_enable.gypi
diff options
context:
space:
mode:
authorbshe <bshe@chromium.org>2015-02-08 19:24:07 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-09 03:24:33 +0000
commitc29be3bc08f24d515d07547570e5d0d7f1a10ff3 (patch)
treec4a33746cf12cd484f3fda86aa882a0e75bb1a9c /remoting/remoting_enable.gypi
parent1e04aae816f6ac47f30a29fb3b0e2531216a8686 (diff)
downloadchromium_src-c29be3bc08f24d515d07547570e5d0d7f1a10ff3.zip
chromium_src-c29be3bc08f24d515d07547570e5d0d7f1a10ff3.tar.gz
chromium_src-c29be3bc08f24d515d07547570e5d0d7f1a10ff3.tar.bz2
Revert of [Chromoting] Remove wildcard ('*') from remoting_all target. (patchset #8 id:140001 of https://codereview.chromium.org/896743004/)
Reason for revert: It cause ChromiumOS.Chromium and PFQ bots to fail. The reason might because chroot didn't have "dpkg-architecture" command. The correct solution might be add "dpkg-architecture" command to chroot. But this CL currently break PFQ and a bunch of bots. So revert it for immediate fix. See crbug.com/456491 Original issue's description: > [Chromoting] Remove wildcard ('*') from remoting_all target. > > Support for the wildcard is going away in GN, so this helps prepare for the transition away from GYP. > > This cl adds dummy targets so that that logic for when the proper targets should be build can be kept in the platform-specific files. > > Some of the conditions in the host gyp files needed to be restructured so that the dummy targets would be defined only when necessary. The updated conditions caused a lot of lines to be re-indented, but the target definitions are the same (except for the new dummy targets). > > BUG= > > Committed: https://crrev.com/9fb75ed89c0ae4ced679576f9cf030cc8c30e928 > Cr-Commit-Position: refs/heads/master@{#315150} TBR=kelvinp@chromium.org,garykac@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG= Review URL: https://codereview.chromium.org/905223002 Cr-Commit-Position: refs/heads/master@{#315261}
Diffstat (limited to 'remoting/remoting_enable.gypi')
-rw-r--r--remoting/remoting_enable.gypi24
1 files changed, 0 insertions, 24 deletions
diff --git a/remoting/remoting_enable.gypi b/remoting/remoting_enable.gypi
deleted file mode 100644
index 8964f6c..0000000
--- a/remoting/remoting_enable.gypi
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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
-}