Chromium Code Reviews| Index: services/nacl/BUILD.gn | 
| diff --git a/services/nacl/BUILD.gn b/services/nacl/BUILD.gn | 
| index 656ec1c14cd25f2246dd7a510e7fb4fc46cf7c84..d52401392cf617cad7efb2abe4b1c83c59c0fbe2 100644 | 
| --- a/services/nacl/BUILD.gn | 
| +++ b/services/nacl/BUILD.gn | 
| @@ -3,6 +3,7 @@ | 
| # found in the LICENSE file. | 
| import("//mojo/public/mojo_application.gni") | 
| +import("//mojo/public/tools/bindings/mojom.gni") | 
| # Trusted code | 
| if (!is_nacl) { | 
| @@ -30,6 +31,7 @@ if (!is_nacl) { | 
| # Non-SFI NaCl can only be executed by a 32-bit process, so our | 
| # content handler must be built and launched as a 32-bit process as well. | 
| mojo_native_application("nacl_content_handler_nonsfi_32_bit") { | 
| + output_name = "nacl_content_handler_nonsfi_nexe" | 
| sources = [ | 
| "content_handler_main_nonsfi.cc", | 
| ] | 
| @@ -45,18 +47,69 @@ if (!is_nacl) { | 
| "//native_client/src/nonsfi/loader:elf_loader", | 
| ] | 
| } | 
| + mojo_native_application("nacl_content_handler_nonsfi_pexe_32_bit") { | 
| + output_name = "nacl_content_handler_nonsfi_pexe" | 
| + sources = [ | 
| + "content_handler_main_nonsfi_pexe.cc", | 
| + ] | 
| + | 
| + deps = [ | 
| + ":pexe_bindings", | 
| + "//base", | 
| + "//mojo/application:application", | 
| + "//mojo/application:content_handler", | 
| + "//mojo/data_pipe_utils", | 
| + "//mojo/message_pump", | 
| + "//mojo/nacl/nonsfi:irt_mojo_nonsfi", | 
| + "//native_client/src/nonsfi/loader:elf_loader", | 
| + ] | 
| + } | 
| + mojo_native_application("pexe_translator_app_32_bit") { | 
| + output_name = "pexe_translator_app" | 
| + sources = [ | 
| + "pexe_translator_app.cc", | 
| + ] | 
| + | 
| + deps = [ | 
| + ":pexe_bindings", | 
| + "//base", | 
| + "//mojo/nacl/nonsfi:irt_mojo_nonsfi", | 
| + "//mojo/public/cpp/application:standalone", | 
| + "//native_client/src/nonsfi/loader:elf_loader", | 
| + ] | 
| + } | 
| + mojo_native_application("pexe_linker_app_32_bit") { | 
| + output_name = "pexe_linker_app" | 
| + sources = [ | 
| + "pexe_linker_app.cc", | 
| + ] | 
| + | 
| + deps = [ | 
| + ":pexe_bindings", | 
| + "//base", | 
| + "//mojo/nacl/nonsfi:irt_mojo_nonsfi", | 
| + "//mojo/public/cpp/application:standalone", | 
| + "//native_client/src/nonsfi/loader:elf_loader", | 
| + ] | 
| + } | 
| # Copy to the root build directory so that the '#!' prefix line for invoking | 
| # our content handler can simply be "mojo:nacl_content_handler_nonsfi". | 
| copy("nacl_content_handler_nonsfi_copy") { | 
| sources = [ | 
| - "${root_out_dir}/nacl_content_handler_nonsfi_32_bit.mojo", | 
| + "${root_out_dir}/nacl_content_handler_nonsfi_nexe.mojo", | 
| + "${root_out_dir}/nacl_content_handler_nonsfi_pexe.mojo", | 
| + "${root_out_dir}/pexe_linker_app.mojo", | 
| + "${root_out_dir}/pexe_translator_app.mojo", | 
| ] | 
| outputs = [ | 
| - "${root_build_dir}/nacl_content_handler_nonsfi.mojo", | 
| + "${root_build_dir}/{{source_name_part}}.mojo", | 
| ] | 
| deps = [ | 
| ":nacl_content_handler_nonsfi_32_bit", | 
| + ":nacl_content_handler_nonsfi_pexe_32_bit", | 
| + ":pexe_translator_app_32_bit", | 
| + ":pexe_linker_app_32_bit", | 
| ] | 
| } | 
| } | 
| @@ -76,3 +129,10 @@ group("nacl_content_handler_nonsfi") { | 
| deps += [ ":nacl_content_handler_nonsfi_copy" ] | 
| } | 
| } | 
| + | 
| +mojom("pexe_bindings") { | 
| 
 
Mark Seaborn
2015/10/20 22:28:58
How about "pexe" -> "pnacl_translator"?
 
Sean Klein
2015/10/22 21:50:00
Done.
 
 | 
| + sources = [ | 
| + "pexe_linker.mojom", | 
| + "pexe_translator.mojom", | 
| + ] | 
| +} |