Chromium Code Reviews| Index: chrome/test/BUILD.gn |
| diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn |
| index c36a2bf836b20b2f32527d52d4cf2b3b104e4c56..5aae60c9da49446622fa44d5dfe263792e93332a 100644 |
| --- a/chrome/test/BUILD.gn |
| +++ b/chrome/test/BUILD.gn |
| @@ -678,6 +678,13 @@ if (!is_android) { |
| defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] |
| + # TODO(GYP) http://crbug.com/462791 |
| + defines += [ "DISABLE_NACL_BROWSERTESTS" ] |
| + declare_args() { |
|
brettw
2015/08/07 21:11:57
Can you put this declare_args at the top of the fi
jam
2015/08/07 21:16:35
Done.
|
| + # Switches to using platform functions instead of ICU on Android. |
|
brettw
2015/08/07 21:11:57
This comment is, um, wrong.
jam
2015/08/07 21:16:35
Done.
|
| + enable_nacl_browsertests = false |
| + } |
| + |
| # TODO(GYP) if (is_win) { |
| # ['incremental_chrome_dll==1', { |
| # 'UseLibraryDependencyInputs': "true", |
| @@ -691,7 +698,9 @@ if (!is_android) { |
| if (!enable_one_click_signin) { |
| sources -= [ "../browser/ui/sync/one_click_signin_bubble_links_delegate_browsertest.cc" ] |
| } |
| - if (enable_nacl) { |
| + if (!enable_nacl_browsertests) { |
| + sources -= [ "../browser/extensions/api/hotword_private/hotword_private_apitest.cc" ] |
| + } else if (enable_nacl) { |
| sources += [ |
| "../browser/extensions/extension_nacl_browsertest.cc", |
| "../browser/nacl_host/test/gdb_debug_stub_browsertest.cc", |
| @@ -956,7 +965,7 @@ if (!is_android) { |
| "../browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc", |
| ] |
| } |
| - if (!is_android && !is_ios) { |
| + if (!is_android && !is_ios && enable_nacl_browsertests) { |
| sources += |
| [ "../browser/copresence/chrome_whispernet_client_browsertest.cc" ] |
| deps += [ "//components/copresence" ] |