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

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
« no previous file with comments | « chrome/chrome.isolate ('k') | chrome/test/nacl/nacl_browsertest.cc » ('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 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 1506 matching lines...) Expand 10 before | Expand all | Expand 10 after
1517 ['chromeos==1', { 1517 ['chromeos==1', {
1518 'dependencies': [ 1518 'dependencies': [
1519 '../ash/ash_resources.gyp:ash_resources', 1519 '../ash/ash_resources.gyp:ash_resources',
1520 '../chromeos/chromeos.gyp:chromeos', 1520 '../chromeos/chromeos.gyp:chromeos',
1521 ], 1521 ],
1522 'conditions': [ 1522 'conditions': [
1523 ['disable_nacl==0 and disable_nacl_untrusted==0', { 1523 ['disable_nacl==0 and disable_nacl_untrusted==0', {
1524 'dependencies': [ 1524 'dependencies': [
1525 '../native_client/src/trusted/service_runtime/linux/nacl_bootstr ap.gyp:nacl_helper_bootstrap', 1525 '../native_client/src/trusted/service_runtime/linux/nacl_bootstr ap.gyp:nacl_helper_bootstrap',
1526 '../components/nacl.gyp:nacl_helper', 1526 '../components/nacl.gyp:nacl_helper',
1527 '../components/nacl_nonsfi.gyp:nacl_helper_nonsfi',
1527 ], 1528 ],
1528 }], 1529 }],
1529 ], 1530 ],
1530 'sources': [ 1531 'sources': [
1531 '<@(chrome_interactive_ui_test_chromeos_sources)', 1532 '<@(chrome_interactive_ui_test_chromeos_sources)',
1532 ], 1533 ],
1533 'sources!': [ 1534 'sources!': [
1534 '../ui/views/widget/desktop_aura/desktop_window_tree_host_x11_intera ctive_uitest.cc', 1535 '../ui/views/widget/desktop_aura/desktop_window_tree_host_x11_intera ctive_uitest.cc',
1535 '../ui/views/widget/desktop_aura/x11_topmost_window_finder_interacti ve_uitest.cc', 1536 '../ui/views/widget/desktop_aura/x11_topmost_window_finder_interacti ve_uitest.cc',
1536 1537
(...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after
2018 'browser/nacl_host/test/gdb_debug_stub_browsertest.cc', 2019 'browser/nacl_host/test/gdb_debug_stub_browsertest.cc',
2019 ], 2020 ],
2020 'dependencies': [ 2021 'dependencies': [
2021 'chrome.gyp:chrome_nacl_win64', 2022 'chrome.gyp:chrome_nacl_win64',
2022 ], 2023 ],
2023 }], 2024 }],
2024 ['OS=="linux"', { 2025 ['OS=="linux"', {
2025 'dependencies': [ 2026 'dependencies': [
2026 '../native_client/src/trusted/service_runtime/linux/nacl_bootstr ap.gyp:nacl_helper_bootstrap', 2027 '../native_client/src/trusted/service_runtime/linux/nacl_bootstr ap.gyp:nacl_helper_bootstrap',
2027 '../components/nacl.gyp:nacl_helper', 2028 '../components/nacl.gyp:nacl_helper',
2029 '../components/nacl_nonsfi.gyp:nacl_helper_nonsfi',
2028 ], 2030 ],
2029 }], 2031 }],
2030 ['chromeos==0', { 2032 ['chromeos==0', {
2031 'sources!': [ 2033 'sources!': [
2032 'test/data/chromeos/oobe_webui_browsertest.js', 2034 'test/data/chromeos/oobe_webui_browsertest.js',
2033 ], 2035 ],
2034 }], 2036 }],
2035 ], 2037 ],
2036 }], 2038 }],
2037 ['debug_devtools==1', { 2039 ['debug_devtools==1', {
(...skipping 1192 matching lines...) Expand 10 before | Expand all | Expand 10 after
3230 ['enable_webrtc==1', { 3232 ['enable_webrtc==1', {
3231 'dependencies': [ 3233 'dependencies': [
3232 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' 3234 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc'
3233 ] 3235 ]
3234 }], 3236 }],
3235 ], 3237 ],
3236 }] 3238 }]
3237 }], 3239 }],
3238 ], # 'conditions' 3240 ], # 'conditions'
3239 } 3241 }
OLDNEW
« no previous file with comments | « chrome/chrome.isolate ('k') | chrome/test/nacl/nacl_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698