diff options
| author | kelvinp <kelvinp@chromium.org> | 2014-11-26 15:35:52 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-26 23:36:28 +0000 |
| commit | 97133eda3fbb4a6ea910ecd98e9405b7e9ead252 (patch) | |
| tree | c7bee080e4874cb5bc4c8ac69c0e426b61ebd12b /remoting/remoting_host.gypi | |
| parent | 50ff7a9494412cdab84c472db73d1e148fcec761 (diff) | |
| download | chromium_src-97133eda3fbb4a6ea910ecd98e9405b7e9ead252.zip chromium_src-97133eda3fbb4a6ea910ecd98e9405b7e9ead252.tar.gz chromium_src-97133eda3fbb4a6ea910ecd98e9405b7e9ead252.tar.bz2 | |
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}
Diffstat (limited to 'remoting/remoting_host.gypi')
| -rw-r--r-- | remoting/remoting_host.gypi | 10 |
1 files changed, 5 insertions, 5 deletions
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', |