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

Side by Side Diff: content/content_browsertests.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, 2 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 | « chrome/unit_tests.isolate ('k') | content/content_unittests.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) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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=="android"', { 6 ['OS=="android"', {
7 'variables': { 7 'variables': {
8 'isolate_dependency_tracked': [ 8 'isolate_dependency_tracked': [
9 '<(PRODUCT_DIR)/content_shell/assets/content_shell.pak', 9 '<(PRODUCT_DIR)/content_shell/assets/content_shell.pak',
10 ], 10 ],
(...skipping 29 matching lines...) Expand all
40 '<(PRODUCT_DIR)', 40 '<(PRODUCT_DIR)',
41 '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)', 41 '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)',
42 '--test-launcher-bot-mode', 42 '--test-launcher-bot-mode',
43 ], 43 ],
44 'isolate_dependency_tracked': [ 44 'isolate_dependency_tracked': [
45 '../testing/xvfb.py', 45 '../testing/xvfb.py',
46 '<(PRODUCT_DIR)/content_shell.pak', 46 '<(PRODUCT_DIR)/content_shell.pak',
47 '<(PRODUCT_DIR)/libffmpegsumo.so', 47 '<(PRODUCT_DIR)/libffmpegsumo.so',
48 '<(PRODUCT_DIR)/libosmesa.so', 48 '<(PRODUCT_DIR)/libosmesa.so',
49 '<(PRODUCT_DIR)/libppapi_tests.so', 49 '<(PRODUCT_DIR)/libppapi_tests.so',
50 ],
51 },
52 }],
53 ['OS=="linux" and use_ozone==0', {
54 'variables': {
55 'isolate_dependency_tracked': [
50 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', 56 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
51 ], 57 ],
52 }, 58 },
53 }], 59 }],
54 ['OS=="linux" or OS=="mac" or OS=="win"', { 60 ['OS=="linux" or OS=="mac" or OS=="win"', {
55 'variables': { 61 'variables': {
56 'isolate_dependency_tracked': [ 62 'isolate_dependency_tracked': [
57 '../ppapi/tests/test_case.html', 63 '../ppapi/tests/test_case.html',
58 '../ppapi/tests/test_page.css', 64 '../ppapi/tests/test_page.css',
59 '../testing/test_env.py', 65 '../testing/test_env.py',
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 'isolate_dependency_untracked': [ 112 'isolate_dependency_untracked': [
107 '<(PRODUCT_DIR)/content_browsertests.exe.pdb', 113 '<(PRODUCT_DIR)/content_browsertests.exe.pdb',
108 ], 114 ],
109 }, 115 },
110 }], 116 }],
111 ], 117 ],
112 'includes': [ 118 'includes': [
113 '../third_party/icu/icu.isolate', 119 '../third_party/icu/icu.isolate',
114 ], 120 ],
115 } 121 }
OLDNEW
« no previous file with comments | « chrome/unit_tests.isolate ('k') | content/content_unittests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698