Chromium Code Reviews| 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..3c01d52a6db82d7c4105368d61a7f41015fe15ed 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_nonsfi_out_dir': '<(PRODUCT_DIR)/>(nexe_destination_dir)/nonsfi', |
|
Mark Seaborn
2014/04/26 00:18:59
Should be "nacl_pnacl_newlib_nonsfi_out_dir" for c
hidehiko
2014/04/28 08:44:27
As create_nmf.py doesn't support nonsfi, we need t
|
| '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_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 convered below. Currently, these are exclusive. |
|
dmichael (off chromium)
2014/04/25 21:06:58
convered->covered
hidehiko
2014/04/28 08:44:27
Done.
|
| + ['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_nonsfi_out_dir)', |
| + 'files': [ |
| + '>@(test_files)', |
| + ], |
| + }, |
| + ], |
| + }], |
| ['nexe_target!=""', { |
| 'variables': { |
| # Patch over the fact that untrusted.gypi doesn't define these in all |