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

Side by Side Diff: chrome/browser_tests.isolate

Issue 687173002: Fix build with disable_nacl=1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: updated 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 | « build/isolate.gypi ('k') | chrome/chrome.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 '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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 '../ppapi/tests/test_case.html', 47 '../ppapi/tests/test_case.html',
48 '../ppapi/tests/test_page.css', 48 '../ppapi/tests/test_page.css',
49 '../testing/test_env.py', 49 '../testing/test_env.py',
50 '../third_party/accessibility-audit/axs_testing.js', 50 '../third_party/accessibility-audit/axs_testing.js',
51 '../third_party/pyftpdlib/', 51 '../third_party/pyftpdlib/',
52 '../third_party/pywebsocket/', 52 '../third_party/pywebsocket/',
53 '../third_party/safe_browsing/', 53 '../third_party/safe_browsing/',
54 '../third_party/simplejson/', 54 '../third_party/simplejson/',
55 '../third_party/tlslite/', 55 '../third_party/tlslite/',
56 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', 56 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
57 '<(PRODUCT_DIR)/nacl_test_data/',
58 '<(PRODUCT_DIR)/peerconnection_server<(EXECUTABLE_SUFFIX)', 57 '<(PRODUCT_DIR)/peerconnection_server<(EXECUTABLE_SUFFIX)',
59 '<(PRODUCT_DIR)/pnacl/',
60 '<(PRODUCT_DIR)/ppapi_nacl_tests_newlib.nmf',
61 '<(PRODUCT_DIR)/ppapi_nacl_tests_pnacl.nmf',
62 '<(PRODUCT_DIR)/pseudo_locales/', 58 '<(PRODUCT_DIR)/pseudo_locales/',
63 '<(PRODUCT_DIR)/pyproto/', 59 '<(PRODUCT_DIR)/pyproto/',
64 '<(PRODUCT_DIR)/remoting/unittests/', 60 '<(PRODUCT_DIR)/remoting/unittests/',
65 '<(PRODUCT_DIR)/test_case.html', 61 '<(PRODUCT_DIR)/test_case.html',
66 '<(PRODUCT_DIR)/test_case.html.mock-http-headers', 62 '<(PRODUCT_DIR)/test_case.html.mock-http-headers',
67 '<(PRODUCT_DIR)/test_data/', 63 '<(PRODUCT_DIR)/test_data/',
68 '<(PRODUCT_DIR)/test_page.css', 64 '<(PRODUCT_DIR)/test_page.css',
69 '<(PRODUCT_DIR)/test_url_loader_data/', 65 '<(PRODUCT_DIR)/test_url_loader_data/',
70 'browser/policy/test/asn1der.py', 66 'browser/policy/test/asn1der.py',
71 'browser/policy/test/policy_testserver.py', 67 'browser/policy/test/policy_testserver.py',
72 'common/extensions/docs/examples/apps/calculator/', 68 'common/extensions/docs/examples/apps/calculator/',
73 'test/data/', 69 'test/data/',
74 'third_party/mock4js/', 70 'third_party/mock4js/',
75 ], 71 ],
76 'read_only': 1, 72 'read_only': 1,
77 }, 73 },
78 }], 74 }],
75 ['disable_nacl==0 and (OS=="linux" or OS=="mac" or OS=="win")', {
76 'variables': {
77 'files': [
78 '<(PRODUCT_DIR)/nacl_test_data/',
79 '<(PRODUCT_DIR)/pnacl/',
80 '<(PRODUCT_DIR)/ppapi_nacl_tests_newlib.nmf',
81 '<(PRODUCT_DIR)/ppapi_nacl_tests_pnacl.nmf',
82 ],
83 'read_only': 1,
84 },
85 }],
79 ['OS=="linux" or OS=="win"', { 86 ['OS=="linux" or OS=="win"', {
80 'variables': { 87 'variables': {
81 'files': [ 88 'files': [
82 '../third_party/bidichecker/', 89 '../third_party/bidichecker/',
90 ],
91 },
92 }],
93 ['disable_nacl==0 and (OS=="linux" or OS=="win")', {
94 'variables': {
95 'files': [
83 '<(PRODUCT_DIR)/mock_nacl_gdb<(EXECUTABLE_SUFFIX)', 96 '<(PRODUCT_DIR)/mock_nacl_gdb<(EXECUTABLE_SUFFIX)',
84 ], 97 ],
85 }, 98 },
86 }], 99 }],
87 [('(OS=="linux" or OS=="mac" or OS=="win") and ' 100 [('disable_nacl==0 and (OS=="linux" or OS=="mac" or OS=="win") and '
88 '(target_arch=="x64" or target_arch=="ia32")'), { 101 '(target_arch=="x64" or target_arch=="ia32")'), {
89 'variables': { 102 'variables': {
90 'files': [ 103 'files': [
91 '<(PRODUCT_DIR)/ppapi_nacl_tests_glibc.nmf', 104 '<(PRODUCT_DIR)/ppapi_nacl_tests_glibc.nmf',
92 ], 105 ],
93 }, 106 },
94 }], 107 }],
95 ['OS=="linux" and target_arch=="ia32"', { 108 ['disable_nacl==0 and OS=="linux" and target_arch=="ia32"', {
96 'variables': { 109 'variables': {
97 'files': [ 110 'files': [
98 '<(PRODUCT_DIR)/ppapi_nacl_tests_pnacl_nonsfi.nmf', 111 '<(PRODUCT_DIR)/ppapi_nacl_tests_pnacl_nonsfi.nmf',
99 ], 112 ],
100 }, 113 },
101 }], 114 }],
102 ['OS=="linux" and target_arch=="arm"', { 115 ['disable_nacl==0 and OS=="linux" and target_arch=="arm"', {
103 'variables': { 116 'variables': {
104 'files': [ 117 'files': [
105 '<(PRODUCT_DIR)/ppapi_nacl_tests_newlib_arm.nexe', 118 '<(PRODUCT_DIR)/ppapi_nacl_tests_newlib_arm.nexe',
106 '<(PRODUCT_DIR)/ppapi_nacl_tests_pnacl_newlib_arm.nexe', 119 '<(PRODUCT_DIR)/ppapi_nacl_tests_pnacl_newlib_arm.nexe',
107 ], 120 ],
108 }, 121 },
109 }], 122 }],
110 ['OS=="win" or ((OS=="linux" or OS=="mac") and target_arch=="x64")', { 123 ['disable_nacl==0 and (OS=="win" or '
124 '((OS=="linux" or OS=="mac") and target_arch=="x64"))', {
111 'variables': { 125 'variables': {
112 'files': [ 126 'files': [
113 '<(PRODUCT_DIR)/lib64/', 127 '<(PRODUCT_DIR)/lib64/',
114 '<(PRODUCT_DIR)/ppapi_nacl_tests_glibc_x64.nexe', 128 '<(PRODUCT_DIR)/ppapi_nacl_tests_glibc_x64.nexe',
115 '<(PRODUCT_DIR)/ppapi_nacl_tests_newlib_x64.nexe', 129 '<(PRODUCT_DIR)/ppapi_nacl_tests_newlib_x64.nexe',
116 '<(PRODUCT_DIR)/ppapi_nacl_tests_pnacl_newlib_x64.nexe', 130 '<(PRODUCT_DIR)/ppapi_nacl_tests_pnacl_newlib_x64.nexe',
117 ], 131 ],
118 }, 132 },
119 }], 133 }],
120 ['(OS=="mac" or OS=="linux" or OS=="win") and target_arch=="ia32"', { 134 ['disable_nacl==0 and target_arch=="ia32" and'
135 '(OS=="mac" or OS=="linux" or OS=="win")', {
121 'variables': { 136 'variables': {
122 'files': [ 137 'files': [
123 '<(PRODUCT_DIR)/lib32/', 138 '<(PRODUCT_DIR)/lib32/',
124 '<(PRODUCT_DIR)/ppapi_nacl_tests_glibc_x32.nexe', 139 '<(PRODUCT_DIR)/ppapi_nacl_tests_glibc_x32.nexe',
125 '<(PRODUCT_DIR)/ppapi_nacl_tests_newlib_x32.nexe', 140 '<(PRODUCT_DIR)/ppapi_nacl_tests_newlib_x32.nexe',
126 '<(PRODUCT_DIR)/ppapi_nacl_tests_pnacl_newlib_x32.nexe', 141 '<(PRODUCT_DIR)/ppapi_nacl_tests_pnacl_newlib_x32.nexe',
127 ], 142 ],
128 }, 143 },
129 }], 144 }],
130 ['OS=="mac"', { 145 ['OS=="mac"', {
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 'browser/chromeos/login/test/https_forwarder.py', 218 'browser/chromeos/login/test/https_forwarder.py',
204 ], 219 ],
205 }, 220 },
206 }], 221 }],
207 ], 222 ],
208 'includes': [ 223 'includes': [
209 '../base/base.isolate', 224 '../base/base.isolate',
210 'chrome.isolate', 225 'chrome.isolate',
211 ], 226 ],
212 } 227 }
OLDNEW
« no previous file with comments | « build/isolate.gypi ('k') | chrome/chrome.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698