| Index: ppapi/ppapi_nacl_test_common.gypi
|
| diff --git a/ppapi/ppapi_nacl_test_common.gypi b/ppapi/ppapi_nacl_test_common.gypi
|
| index b5c605550f2bade62b0eba09cc65295b388ef626..0d9b676884821509868a0cb8600822b1f6d9e91c 100644
|
| --- a/ppapi/ppapi_nacl_test_common.gypi
|
| +++ b/ppapi/ppapi_nacl_test_common.gypi
|
| @@ -19,6 +19,7 @@
|
| 'nacl_newlib_out_dir': '<(PRODUCT_DIR)/>(nexe_destination_dir)/newlib',
|
| 'nacl_glibc_out_dir': '<(PRODUCT_DIR)/>(nexe_destination_dir)/glibc',
|
| 'nacl_pnacl_newlib_out_dir': '<(PRODUCT_DIR)/>(nexe_destination_dir)/pnacl',
|
| + 'nacl_pnacl_newlib_nonsfi_out_dir': '<(PRODUCT_DIR)/>(nexe_destination_dir)/nonsfi',
|
| 'target_conditions': [
|
| ['nexe_target!=""', {
|
| # These variables are used for nexe building and for library building.
|
| @@ -33,6 +34,7 @@
|
| 'nmf_glibc%': '>(nacl_glibc_out_dir)/>(nexe_target).nmf',
|
| 'out_pnacl_newlib%': '>(nacl_pnacl_newlib_out_dir)/>(nexe_target)_newlib_pnacl.pexe',
|
| 'nmf_pnacl_newlib%': '>(nacl_pnacl_newlib_out_dir)/>(nexe_target).nmf',
|
| + 'out_pnacl_newlib_x86_32_nonsfi_nexe': '>(nacl_pnacl_newlib_nonsfi_out_dir)/>(nexe_target)_pnacl_newlib_x32_nonsfi.nexe',
|
| }],
|
| ],
|
| },
|
| @@ -62,7 +64,8 @@
|
| },
|
| ],
|
| }],
|
| - ['test_files!=[] and build_pnacl_newlib==1 and disable_pnacl==0', {
|
| + # Nonsfi pnacl copy is covered below. Currently, these are exclusive.
|
| + ['test_files!=[] and build_pnacl_newlib==1 and disable_pnacl==0 and enable_x86_32_nonsfi==0', {
|
| 'copies': [
|
| {
|
| 'destination': '>(nacl_pnacl_newlib_out_dir)',
|
| @@ -72,6 +75,16 @@
|
| },
|
| ],
|
| }],
|
| + ['test_files!=[] and build_pnacl_newlib==1 and enable_x86_32_nonsfi==1', {
|
| + 'copies': [
|
| + {
|
| + 'destination': '>(nacl_pnacl_newlib_nonsfi_out_dir)',
|
| + 'files': [
|
| + '>@(test_files)',
|
| + ],
|
| + },
|
| + ],
|
| + }],
|
| ['nexe_target!=""', {
|
| 'variables': {
|
| # Patch over the fact that untrusted.gypi doesn't define these in all
|
|
|