Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2014 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'conditions': [ | 6 'conditions': [ |
| 7 ['archive_chromoting_tests==1', { | 7 ['OS!="linux" and archive_chromoting_tests==1', { |
| 8 'targets': [ | 8 'targets': [ |
| 9 { | 9 { |
| 10 'target_name': 'chromoting_integration_tests_run', | 10 'target_name': 'chromoting_integration_tests_run', |
| 11 'type': 'none', | 11 'type': 'none', |
| 12 'dependencies': [ | 12 'dependencies': [ |
| 13 '../../chrome/chrome.gyp:browser_tests', | 13 '../../chrome/chrome.gyp:browser_tests', |
| 14 '../../remoting/remoting.gyp:remoting_webapp_v1', | 14 '../../remoting/remoting.gyp:remoting_webapp_v1', |
| 15 '../../remoting/remoting.gyp:remoting_webapp_v2', | 15 '../../remoting/remoting.gyp:remoting_webapp_v2', |
| 16 ], | 16 ], |
| 17 'includes': [ | 17 'includes': [ |
| 18 '../../build/isolate.gypi', | 18 '../../build/isolate.gypi', |
| 19 ], | 19 ], |
| 20 'sources': [ | 20 'sources': [ |
| 21 'chromoting_integration_tests.isolate', | 21 'chromoting_integration_tests.isolate', |
| 22 ], | 22 ], |
| 23 }, | 23 }, |
| 24 ], | 24 ], |
| 25 }], | 25 }], |
| 26 ['OS=="linux" and archive_chromoting_tests==1', { | |
| 27 'targets': [ | |
| 28 { | |
| 29 'target_name': 'chromoting_integration_tests_run', | |
| 30 'type': 'none', | |
| 31 'dependencies': [ | |
| 32 '../../chrome/chrome.gyp:browser_tests', | |
| 33 '../../remoting/remoting.gyp:remoting_webapp_v1', | |
| 34 '../../remoting/remoting.gyp:remoting_webapp_v2', | |
| 35 '../../remoting/remoting.gyp:remoting_me2me_host_archive', | |
|
Lambros
2014/11/12 02:06:02
This line is the only thing that is changed, so yo
anandc
2014/11/12 21:50:35
Done.
| |
| 36 ], | |
| 37 'includes': [ | |
| 38 '../../build/isolate.gypi', | |
| 39 ], | |
| 40 'sources': [ | |
| 41 'chromoting_integration_tests.isolate', | |
| 42 ], | |
| 43 }, | |
| 44 ], | |
| 45 }], | |
| 26 ], | 46 ], |
| 27 } | 47 } |
| OLD | NEW |