Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(958)

Side by Side Diff: testing/chromoting/integration_tests.gyp

Issue 723343002: Update from https://crrev.com/304121 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « testing/chromoting/chromoting_integration_tests.isolate ('k') | testing/iossim/iossim.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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': [
24 ['OS=="linux"', {
25 'dependencies': [
26 '../../remoting/remoting.gyp:remoting_me2me_host_archive',
27 ],
28 }], # OS=="linux"
29 ],
23 }, 30 },
24 ], 31 ],
25 }], 32 }],
26 ], 33 ],
27 } 34 }
OLDNEW
« no previous file with comments | « testing/chromoting/chromoting_integration_tests.isolate ('k') | testing/iossim/iossim.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698