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

Side by Side Diff: chrome/sync_integration_tests.isolate

Issue 203963003: Turns on use_mojo=1 for linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chromeos==0 Created 6 years, 9 months 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 | Annotate | Revision Log
OLDNEW
1 # Copyright 2012 The Chromium Authors. All rights reserved. 1 # Copyright 2012 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 'conditions': [ 5 'conditions': [
6 ['OS=="linux"', { 6 ['OS=="linux"', {
7 'variables': { 7 'variables': {
8 'command': [ 8 'command': [
9 '../testing/xvfb.py', 9 '../testing/xvfb.py',
10 '<(PRODUCT_DIR)', 10 '<(PRODUCT_DIR)',
(...skipping 10 matching lines...) Expand all
21 '<(PRODUCT_DIR)/nacl_helper<(EXECUTABLE_SUFFIX)', 21 '<(PRODUCT_DIR)/nacl_helper<(EXECUTABLE_SUFFIX)',
22 '<(PRODUCT_DIR)/nacl_helper_bootstrap<(EXECUTABLE_SUFFIX)', 22 '<(PRODUCT_DIR)/nacl_helper_bootstrap<(EXECUTABLE_SUFFIX)',
23 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', 23 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
24 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', 24 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
25 ], 25 ],
26 'isolate_dependency_untracked': [ 26 'isolate_dependency_untracked': [
27 '../net/tools/testserver/', 27 '../net/tools/testserver/',
28 ], 28 ],
29 }, 29 },
30 }], 30 }],
31 ['OS=="linux" and use_mojo==1', {
32 'variables': {
33 'isolate_dependency_tracked': [
34 '<(PRODUCT_DIR)/lib/libmojo_system.so',
35 ],
36 },
37 }],
31 ['OS=="linux" or OS=="mac"', { 38 ['OS=="linux" or OS=="mac"', {
32 'variables': { 39 'variables': {
33 'isolate_dependency_tracked': [ 40 'isolate_dependency_tracked': [
34 '<(PRODUCT_DIR)/resources.pak', 41 '<(PRODUCT_DIR)/resources.pak',
35 '<(PRODUCT_DIR)/sync_integration_tests<(EXECUTABLE_SUFFIX)', 42 '<(PRODUCT_DIR)/sync_integration_tests<(EXECUTABLE_SUFFIX)',
36 ], 43 ],
37 'isolate_dependency_untracked': [ 44 'isolate_dependency_untracked': [
38 '../third_party/pyftpdlib/', 45 '../third_party/pyftpdlib/',
39 '../third_party/pywebsocket/', 46 '../third_party/pywebsocket/',
40 '../third_party/tlslite/', 47 '../third_party/tlslite/',
(...skipping 18 matching lines...) Expand all
59 '<(PRODUCT_DIR)/ffmpegsumo.so', 66 '<(PRODUCT_DIR)/ffmpegsumo.so',
60 ], 67 ],
61 'isolate_dependency_untracked': [ 68 'isolate_dependency_untracked': [
62 '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/', 69 '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/',
63 '<(PRODUCT_DIR)/<(mac_product_name).app/', 70 '<(PRODUCT_DIR)/<(mac_product_name).app/',
64 ], 71 ],
65 }, 72 },
66 }], 73 }],
67 ], 74 ],
68 } 75 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698