From 97133eda3fbb4a6ea910ecd98e9405b7e9ead252 Mon Sep 17 00:00:00 2001
From: kelvinp <kelvinp@chromium.org>
Date: Wed, 26 Nov 2014 15:35:52 -0800
Subject: Fix remoting_me2me_host on Linux depends on Blink and v8

Cause:
Ash depends on blink.  On ChromeOS, we need ash to identify the root
window for screen capturing.

Fix:
We should only depend on ash on ChromeOS.

BUG=436306

Review URL: https://codereview.chromium.org/757393003

Cr-Commit-Position: refs/heads/master@{#305913}
---
 remoting/remoting_host.gypi | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'remoting/remoting_host.gypi')

diff --git a/remoting/remoting_host.gypi b/remoting/remoting_host.gypi
index efe36d1..8fbcdc8 100644
--- a/remoting/remoting_host.gypi
+++ b/remoting/remoting_host.gypi
@@ -111,6 +111,11 @@
                 'host/remoting_me2me_host.cc',
               ],
               'conditions': [
+                ['use_ash==1', {
+                  'dependencies': [
+                    '../ash/ash.gyp:ash',
+                  ],
+                }],
                 ['use_ozone==0', {
                   'sources!': [
                     'host/input_injector_chromeos.cc',
@@ -183,11 +188,6 @@
                 'message': 'Running message compiler on <(RULE_INPUT_PATH)',
               }],
             }],
-            ['use_ash==1', {
-              'dependencies': [
-                 '../ash/ash.gyp:ash',
-              ],
-            }],
             ['enable_webrtc==1', {
               'dependencies': [
                 '../third_party/webrtc/modules/modules.gyp:desktop_capture',
-- 
cgit v1.1