| Index: chrome/test/data/nacl/nacl_test_data.gyp
|
| diff --git a/chrome/test/data/nacl/nacl_test_data.gyp b/chrome/test/data/nacl/nacl_test_data.gyp
|
| index 9494caa5dd188e9c0736717433c7ef952d6e8fc5..ca9dc21b4f6a3e360bf247e8c174450951e720c0 100644
|
| --- a/chrome/test/data/nacl/nacl_test_data.gyp
|
| +++ b/chrome/test/data/nacl/nacl_test_data.gyp
|
| @@ -41,7 +41,7 @@
|
| ],
|
| },
|
| 'conditions': [
|
| - ['target_arch=="ia32" and OS=="linux"', {
|
| + ['(target_arch=="ia32" or target_arch=="x64") and OS=="linux"', {
|
| # Enable nonsfi testing on ia32-linux environment.
|
| # This flag causes test_files to be copied into nonsfi directory,
|
| # too.
|
| @@ -540,7 +540,7 @@
|
| # disabled, but building the binary should work.
|
| # We cannot disable building, as enable_XXX variables are also used
|
| # to build newlib linked nexes.
|
| - ['target_arch=="ia32" and OS=="linux"', {
|
| + ['(target_arch=="ia32" or target_arch=="x64") and OS=="linux"', {
|
| # Enable nonsfi testing on ia32-linux environment.
|
| 'variables': {
|
| 'build_pnacl_newlib': 1,
|
| @@ -594,7 +594,7 @@
|
| 'ppapi_test_lib',
|
| ],
|
| 'conditions': [
|
| - ['target_arch=="ia32" and OS=="linux"', {
|
| + ['(target_arch=="ia32" or target_arch=="x64") and OS=="linux"', {
|
| # Enable nonsfi testing on ia32-linux environment.
|
| 'variables': {
|
| 'enable_x86_32_nonsfi': 1,
|
|
|