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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 724323002: Non-SFI mode: Enable browser_tests for nacl_helper_nonsfi. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 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 'variables': { 5 'variables': {
6 'chrome_browser_extensions_test_support_sources': [ 6 'chrome_browser_extensions_test_support_sources': [
7 # A list of sources which is shared between different browser tests. 7 # A list of sources which is shared between different browser tests.
8 'browser/apps/app_browsertest_util.cc', 8 'browser/apps/app_browsertest_util.cc',
9 'browser/apps/app_browsertest_util.h', 9 'browser/apps/app_browsertest_util.h',
10 'browser/extensions/browsertest_util.cc', 10 'browser/extensions/browsertest_util.cc',
(...skipping 1502 matching lines...) Expand 10 before | Expand all | Expand 10 after
1513 ['chromeos==1', { 1513 ['chromeos==1', {
1514 'dependencies': [ 1514 'dependencies': [
1515 '../ash/ash_resources.gyp:ash_resources', 1515 '../ash/ash_resources.gyp:ash_resources',
1516 '../chromeos/chromeos.gyp:chromeos', 1516 '../chromeos/chromeos.gyp:chromeos',
1517 ], 1517 ],
1518 'conditions': [ 1518 'conditions': [
1519 ['disable_nacl==0 and disable_nacl_untrusted==0', { 1519 ['disable_nacl==0 and disable_nacl_untrusted==0', {
1520 'dependencies': [ 1520 'dependencies': [
1521 '../native_client/src/trusted/service_runtime/linux/nacl_bootstr ap.gyp:nacl_helper_bootstrap', 1521 '../native_client/src/trusted/service_runtime/linux/nacl_bootstr ap.gyp:nacl_helper_bootstrap',
1522 '../components/nacl.gyp:nacl_helper', 1522 '../components/nacl.gyp:nacl_helper',
1523 '../components/nacl_nonsfi.gyp:nacl_helper_nonsfi',
1523 ], 1524 ],
1524 }], 1525 }],
1525 ], 1526 ],
1526 'sources': [ 1527 'sources': [
1527 '<@(chrome_interactive_ui_test_chromeos_sources)', 1528 '<@(chrome_interactive_ui_test_chromeos_sources)',
1528 ], 1529 ],
1529 'sources!': [ 1530 'sources!': [
1530 '../ui/views/widget/desktop_aura/desktop_window_tree_host_x11_intera ctive_uitest.cc', 1531 '../ui/views/widget/desktop_aura/desktop_window_tree_host_x11_intera ctive_uitest.cc',
1531 '../ui/views/widget/desktop_aura/x11_topmost_window_finder_interacti ve_uitest.cc', 1532 '../ui/views/widget/desktop_aura/x11_topmost_window_finder_interacti ve_uitest.cc',
1532 1533
(...skipping 501 matching lines...) Expand 10 before | Expand all | Expand 10 after
2034 'browser/nacl_host/test/gdb_debug_stub_browsertest.cc', 2035 'browser/nacl_host/test/gdb_debug_stub_browsertest.cc',
2035 ], 2036 ],
2036 'dependencies': [ 2037 'dependencies': [
2037 'chrome.gyp:chrome_nacl_win64', 2038 'chrome.gyp:chrome_nacl_win64',
2038 ], 2039 ],
2039 }], 2040 }],
2040 ['OS=="linux"', { 2041 ['OS=="linux"', {
2041 'dependencies': [ 2042 'dependencies': [
2042 '../native_client/src/trusted/service_runtime/linux/nacl_bootstr ap.gyp:nacl_helper_bootstrap', 2043 '../native_client/src/trusted/service_runtime/linux/nacl_bootstr ap.gyp:nacl_helper_bootstrap',
2043 '../components/nacl.gyp:nacl_helper', 2044 '../components/nacl.gyp:nacl_helper',
2045 '../components/nacl_nonsfi.gyp:nacl_helper_nonsfi',
2044 ], 2046 ],
2045 }], 2047 }],
2046 ['chromeos==0', { 2048 ['chromeos==0', {
2047 'sources!': [ 2049 'sources!': [
2048 'test/data/chromeos/oobe_webui_browsertest.js', 2050 'test/data/chromeos/oobe_webui_browsertest.js',
2049 ], 2051 ],
2050 }], 2052 }],
2051 ], 2053 ],
2052 }], 2054 }],
2053 ['debug_devtools==1', { 2055 ['debug_devtools==1', {
(...skipping 1192 matching lines...) Expand 10 before | Expand all | Expand 10 after
3246 ['enable_webrtc==1', { 3248 ['enable_webrtc==1', {
3247 'dependencies': [ 3249 'dependencies': [
3248 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' 3250 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc'
3249 ] 3251 ]
3250 }], 3252 }],
3251 ], 3253 ],
3252 }] 3254 }]
3253 }], 3255 }],
3254 ], # 'conditions' 3256 ], # 'conditions'
3255 } 3257 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698