Index: testing/chromoting/integration_tests.gyp |
diff --git a/testing/chromoting/integration_tests.gyp b/testing/chromoting/integration_tests.gyp |
index b50c3c6233458ddd0bae9193921c1c9f974c1aff..c3f7912b48eecbb45e209d0189e2e21d2e8c411c 100644 |
--- a/testing/chromoting/integration_tests.gyp |
+++ b/testing/chromoting/integration_tests.gyp |
@@ -2,58 +2,28 @@ |
# Use of this source code is governed by a BSD-style license that can be |
# found in the LICENSE file. |
-# TODO: Factor out all of the common items across the test targets into a |
-# single .gypi file that can be included by each test target. |
- |
{ |
'conditions': [ |
['archive_chromoting_tests==1', { |
'targets': [ |
{ |
'target_name': 'chromoting_integration_tests_run', |
- 'type': 'none', |
- 'dependencies': [ |
- '../../chrome/chrome.gyp:browser_tests', |
- '../../remoting/remoting.gyp:remoting_webapp_v1', |
- '../../remoting/remoting.gyp:remoting_webapp_v2', |
- ], |
'includes': [ |
- '../../build/isolate.gypi', |
+ './dependencies.gypi', |
], |
'sources': [ |
'chromoting_integration_tests.isolate', |
], |
- 'conditions': [ |
- ['OS=="linux"', { |
- 'dependencies': [ |
- '../../remoting/remoting.gyp:remoting_me2me_host_archive', |
- '../../remoting/webapp/app_remoting/internal/app_remoting_all.gyp:app_remoting_all_apps', |
- ], |
- }], # OS=="linux" |
- ], |
}, # target_name: 'chromoting_integration_tests_run' |
{ |
'target_name': 'chromoting_multi_machine_example_test', |
- 'type': 'none', |
- 'dependencies': [ |
- '../../chrome/chrome.gyp:browser_tests', |
- '../../remoting/remoting.gyp:remoting_webapp_v1', |
- '../../remoting/remoting.gyp:remoting_webapp_v2', |
- ], |
'includes': [ |
- '../../build/isolate.gypi', |
+ './dependencies.gypi', |
], |
'sources': [ |
'multi_machine_example/example_test_controller.isolate', |
'multi_machine_example/example_task.isolate', |
], |
- 'conditions': [ |
- ['OS=="linux"', { |
- 'dependencies': [ |
- '../../remoting/remoting.gyp:remoting_me2me_host_archive', |
- ], |
- }], # OS=="linux" |
- ], |
}, # target_name: 'chromoting_multi_machine_example_test' |
], |
}], |