diff options
| author | pkotwicz <pkotwicz@chromium.org> | 2014-10-29 07:31:10 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-29 14:31:30 +0000 |
| commit | 2b65d3cb4ecb491fdc7a3f60f138d243aa320559 (patch) | |
| tree | 4f2537a2aad21eabce0a2a59b0a1e0799564be4a /remoting/remoting_host.gypi | |
| parent | 832aa011fa8f98972f04468216dd2fbbd3e7ca42 (diff) | |
| download | chromium_src-2b65d3cb4ecb491fdc7a3f60f138d243aa320559.zip chromium_src-2b65d3cb4ecb491fdc7a3f60f138d243aa320559.tar.gz chromium_src-2b65d3cb4ecb491fdc7a3f60f138d243aa320559.tar.bz2 | |
Make gclient runhooks work with use_athena=1 and use_ash=0
BUG=426561
TEST=None
Review URL: https://codereview.chromium.org/675943002
Cr-Commit-Position: refs/heads/master@{#301832}
Diffstat (limited to 'remoting/remoting_host.gypi')
| -rw-r--r-- | remoting/remoting_host.gypi | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/remoting/remoting_host.gypi b/remoting/remoting_host.gypi index acd1d4e..fdc333e 100644 --- a/remoting/remoting_host.gypi +++ b/remoting/remoting_host.gypi @@ -318,7 +318,6 @@ }], ['chromeos==1', { 'dependencies' : [ - '../ash/ash.gyp:ash', '../cc/cc.gyp:cc', '../content/content.gyp:content', '../ppapi/ppapi_internal.gyp:ppapi_host', @@ -404,6 +403,11 @@ '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', |