| Index: components/nacl/loader/nonsfi/nonsfi_main.cc
|
| diff --git a/components/nacl/loader/nonsfi/nonsfi_main.cc b/components/nacl/loader/nonsfi/nonsfi_main.cc
|
| index 96c6cb2684306969648fb7c033cd7154d9daafe3..8ec69950232dfed795024ccac159072e1f1956a4 100644
|
| --- a/components/nacl/loader/nonsfi/nonsfi_main.cc
|
| +++ b/components/nacl/loader/nonsfi/nonsfi_main.cc
|
| @@ -13,6 +13,8 @@
|
| #include "native_client/src/include/elf_auxv.h"
|
| #include "native_client/src/include/nacl_macros.h"
|
| #include "native_client/src/trusted/desc/nacl_desc_base.h"
|
| +#include "native_client/src/trusted/desc/nacl_desc_io.h"
|
| +#include "native_client/src/trusted/service_runtime/include/sys/fcntl.h"
|
|
|
| namespace nacl {
|
| namespace nonsfi {
|
| @@ -64,8 +66,9 @@ struct NaClDescUnrefer {
|
|
|
| } // namespace
|
|
|
| -void MainStart(NaClDesc* nexe_file) {
|
| - ::scoped_ptr<struct NaClDesc, NaClDescUnrefer> desc(nexe_file);
|
| +void MainStart(int nexe_file) {
|
| + ::scoped_ptr<struct NaClDesc, NaClDescUnrefer> desc(
|
| + NaClDescIoDescFromDescAllocCtor(nexe_file, NACL_ABI_O_RDONLY));
|
| ElfImage image;
|
| if (image.Read(desc.get()) != LOAD_OK) {
|
| LOG(ERROR) << "LoadModuleRpc: Failed to read binary.";
|
|
|