Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 215 '<(PRODUCT_DIR)/keyboard_resources.pak', | 215 '<(PRODUCT_DIR)/keyboard_resources.pak', |
| 216 '<(PRODUCT_DIR)/libexif.so', | 216 '<(PRODUCT_DIR)/libexif.so', |
| 217 '<(PRODUCT_DIR)/locales/', | 217 '<(PRODUCT_DIR)/locales/', |
| 218 '<(PRODUCT_DIR)/nacl_helper', | 218 '<(PRODUCT_DIR)/nacl_helper', |
| 219 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', | 219 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', |
| 220 '<(PRODUCT_DIR)/resources/chromeos/', | 220 '<(PRODUCT_DIR)/resources/chromeos/', |
| 221 'browser/chromeos/login/test/https_forwarder.py', | 221 'browser/chromeos/login/test/https_forwarder.py', |
| 222 ], | 222 ], |
| 223 }, | 223 }, |
| 224 }], | 224 }], |
| 225 # TODO(hidehiko,mazda): Include nacl_helper_nonsfi for ARM when supported. | |
| 226 ['chromeos==1 and (target_arch=="x64" or target_arch=="ia32")', { | |
|
Mark Seaborn
2014/11/14 16:58:41
Why restrict to chromeos==1? We want to run these
hidehiko
2014/11/14 18:45:31
This is here, because nacl_helper is listed above
Mark Seaborn
2014/11/19 06:23:54
Presumably the tests pass without adding this to b
| |
| 227 'variables': { | |
| 228 'files': [ | |
| 229 '<(PRODUCT_DIR)/nacl_helper_nonsfi', | |
|
Mark Seaborn
2014/11/14 16:58:41
Don't we get this via chrome.isolate below?
hidehiko
2014/11/14 18:45:32
Acknowledged.
| |
| 230 ], | |
| 231 }, | |
| 232 }], | |
| 225 ], | 233 ], |
| 226 'includes': [ | 234 'includes': [ |
| 227 '../base/base.isolate', | 235 '../base/base.isolate', |
| 228 'chrome.isolate', | 236 'chrome.isolate', |
| 229 ], | 237 ], |
| 230 } | 238 } |
| OLD | NEW |