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

Side by Side Diff: chrome/browser_tests.isolate

Issue 153093002: Add libpeerconnection.{so,dll} to browser_tests.isolate (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move the libpeerconnection conditions to browser_tests.isolate Created 6 years, 10 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
« no previous file with comments | « build/isolate.gypi ('k') | no next file » | 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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 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 'includes': [ 5 'includes': [
6 'chrome.isolate', 6 'chrome.isolate',
7 ], 7 ],
8 'conditions': [ 8 'conditions': [
9 ['OS=="linux"', { 9 ['OS=="linux"', {
10 'variables': { 10 'variables': {
11 'command': [ 11 'command': [
12 '../testing/xvfb.py', 12 '../testing/xvfb.py',
13 '<(PRODUCT_DIR)', 13 '<(PRODUCT_DIR)',
14 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', 14 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
15 '--test-launcher-bot-mode', 15 '--test-launcher-bot-mode',
16 ], 16 ],
17 'isolate_dependency_tracked': [ 17 'isolate_dependency_tracked': [
18 '../testing/xvfb.py', 18 '../testing/xvfb.py',
19 '<(PRODUCT_DIR)/libclearkeycdm.so', 19 '<(PRODUCT_DIR)/libclearkeycdm.so',
20 '<(PRODUCT_DIR)/libclearkeycdmadapter.so', 20 '<(PRODUCT_DIR)/libclearkeycdmadapter.so',
21 '<(PRODUCT_DIR)/libppapi_tests.so', 21 '<(PRODUCT_DIR)/libppapi_tests.so',
22 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', 22 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
23 ], 23 ],
24 }, 24 },
25 }], 25 }],
26 ['OS=="linux" and libpeer_target_type=="loadable_module"', {
27 'variables': {
28 'isolate_dependency_tracked': [
29 '<(PRODUCT_DIR)/lib/libpeerconnection.so',
30 ],
31 },
32 }],
26 ['OS=="linux" or OS=="mac"', { 33 ['OS=="linux" or OS=="mac"', {
27 'variables': { 34 'variables': {
28 'isolate_dependency_tracked': [ 35 'isolate_dependency_tracked': [
29 'browser/nacl_host/test/debug_stub_browser_tests.py', 36 'browser/nacl_host/test/debug_stub_browser_tests.py',
30 'browser/nacl_host/test/gdb_rsp.py', 37 'browser/nacl_host/test/gdb_rsp.py',
31 ], 38 ],
32 }, 39 },
33 }], 40 }],
34 ['OS=="linux" or OS=="mac" or OS=="win"', { 41 ['OS=="linux" or OS=="mac" or OS=="win"', {
35 'variables': { 42 'variables': {
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 '<(PRODUCT_DIR)/ppapi_tests.dll', 136 '<(PRODUCT_DIR)/ppapi_tests.dll',
130 '<(PRODUCT_DIR)/security_tests.dll', 137 '<(PRODUCT_DIR)/security_tests.dll',
131 'tools/build/repack_locales.py', 138 'tools/build/repack_locales.py',
132 ], 139 ],
133 'isolate_dependency_untracked': [ 140 'isolate_dependency_untracked': [
134 '../third_party/npapi/npspy/extern/plugin/', 141 '../third_party/npapi/npspy/extern/plugin/',
135 '../third_party/psyco_win32/psyco/', 142 '../third_party/psyco_win32/psyco/',
136 ], 143 ],
137 }, 144 },
138 }], 145 }],
146 ['OS=="win" and libpeer_target_type=="loadable_module"', {
147 'variables': {
148 'isolate_dependency_tracked': [
149 '<(PRODUCT_DIR)/libpeerconnection.dll',
150 ],
151 },
152 }],
139 ['chromeos==1', { 153 ['chromeos==1', {
140 'variables': { 154 'variables': {
141 'isolate_dependency_untracked': [ 155 'isolate_dependency_untracked': [
142 '<(PRODUCT_DIR)/chromevox_test_data/', 156 '<(PRODUCT_DIR)/chromevox_test_data/',
143 ], 157 ],
144 }, 158 },
145 }], 159 }],
146 ], 160 ],
147 } 161 }
OLDNEW
« no previous file with comments | « build/isolate.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698