diff options
| author | hidehiko@chromium.org <hidehiko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-02 23:24:52 +0000 |
|---|---|---|
| committer | hidehiko@chromium.org <hidehiko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-02 23:24:52 +0000 |
| commit | ae5f7f8df0da772d0658971334f8356a45a2720c (patch) | |
| tree | 820952854634b6face0c68222a96ca25adde0e07 /ppapi/ppapi_nacl_test_common.gypi | |
| parent | 49a6d858575651f079c883ef0f6122ee8185dcee (diff) | |
| download | chromium_src-ae5f7f8df0da772d0658971334f8356a45a2720c.zip chromium_src-ae5f7f8df0da772d0658971334f8356a45a2720c.tar.gz chromium_src-ae5f7f8df0da772d0658971334f8356a45a2720c.tar.bz2 | |
Implement open_resource in non-SFI mode.
This CL implements open_resource() in non-SFI mode.
1) Introduced a new sync message PpapiHostMsg_OpenResource
and its handlers.
2) Implement async version of OpenManifestEntry. As IPC's
handler is called on renderer's main thread, otherwise it
causes deadlock.
TEST=Run trybots.
BUG=358431
Review URL: https://codereview.chromium.org/249183004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267962 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/ppapi_nacl_test_common.gypi')
| -rw-r--r-- | ppapi/ppapi_nacl_test_common.gypi | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/ppapi/ppapi_nacl_test_common.gypi b/ppapi/ppapi_nacl_test_common.gypi index b5c60555..0d9b676 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 |