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

Side by Side Diff: chrome/browser_tests.isolate

Issue 599863003: Fix ChromeOS Ozone build since it doesn't have xdisplaycheck. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
« no previous file with comments | « build/isolate.gypi ('k') | chrome/interactive_ui_tests.isolate » ('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) 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 ],
23 },
24 }],
25 ['OS=="linux" and use_ozone==0', {
26 'variables': {
27 'isolate_dependency_tracked': [
22 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', 28 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
23 ], 29 ],
24 }, 30 },
25 }], 31 }],
26 ['OS=="linux" and libpeer_target_type=="loadable_module"', { 32 ['OS=="linux" and libpeer_target_type=="loadable_module"', {
27 'variables': { 33 'variables': {
28 'isolate_dependency_tracked': [ 34 'isolate_dependency_tracked': [
29 '<(PRODUCT_DIR)/lib/libpeerconnection.so', 35 '<(PRODUCT_DIR)/lib/libpeerconnection.so',
30 ], 36 ],
31 }, 37 },
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 '../ui/file_manager/file_manager/', 172 '../ui/file_manager/file_manager/',
167 '../ui/webui/resources/js/', 173 '../ui/webui/resources/js/',
168 '<(PRODUCT_DIR)/chromevox_test_data/', 174 '<(PRODUCT_DIR)/chromevox_test_data/',
169 '<(PRODUCT_DIR)/locales/', 175 '<(PRODUCT_DIR)/locales/',
170 '<(PRODUCT_DIR)/resources/chromeos/', 176 '<(PRODUCT_DIR)/resources/chromeos/',
171 ], 177 ],
172 }, 178 },
173 }], 179 }],
174 ], 180 ],
175 } 181 }
OLDNEW
« no previous file with comments | « build/isolate.gypi ('k') | chrome/interactive_ui_tests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698