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 ['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 'conditions': [ | 23 'conditions': [ |
24 ['OS=="linux"', { | 24 ['OS=="linux"', { |
25 'dependencies': [ | 25 'dependencies': [ |
26 '../../remoting/remoting.gyp:remoting_me2me_host_archive', | 26 '../../remoting/remoting.gyp:remoting_me2me_host_archive', |
27 ], | 27 ], |
28 }], # OS=="linux" | 28 }], # OS=="linux" |
29 ], | 29 ], |
30 }, | 30 }, # target_name: 'chromoting_integration_tests_run' |
31 { | |
32 'target_name': 'chromoting_multi_machine_example_test', | |
33 'type': 'none', | |
34 'dependencies': [ | |
anandc
2015/03/16 23:24:46
Would adding a dependency here like:
'./integratio
Mike Meade
2015/03/16 23:35:50
As per M-A we would need to refactor out the commo
anandc
2015/03/16 23:52:10
OK, could you add a TODO to that effect please?
| |
35 '../../chrome/chrome.gyp:browser_tests', | |
36 '../../remoting/remoting.gyp:remoting_webapp_v1', | |
37 '../../remoting/remoting.gyp:remoting_webapp_v2', | |
38 ], | |
39 'includes': [ | |
40 '../../build/isolate.gypi', | |
41 ], | |
42 'sources': [ | |
43 'multi_machine_example/example_test_controller.isolate', | |
44 'multi_machine_example/example_task.isolate', | |
45 ], | |
46 'conditions': [ | |
47 ['OS=="linux"', { | |
48 'dependencies': [ | |
49 '../../remoting/remoting.gyp:remoting_me2me_host_archive', | |
50 ], | |
51 }], # OS=="linux" | |
52 ], | |
53 }, # target_name: 'chromoting_multi_machine_example_test' | |
31 ], | 54 ], |
32 }], | 55 }], |
33 ], | 56 ], |
34 } | 57 } |
OLD | NEW |