Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2186)

Unified Diff: mojo/nacl/monacl_shell_nonsfi.cc

Issue 1398213003: Refactored Non-SFI and SFI NaCl into separate directories. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/nacl/monacl_shell.cc ('k') | mojo/nacl/nexe_launcher_nonsfi.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/nacl/monacl_shell_nonsfi.cc
diff --git a/mojo/nacl/monacl_shell_nonsfi.cc b/mojo/nacl/monacl_shell_nonsfi.cc
deleted file mode 100644
index b90b19e4407476686268c2c7c6b29fc36924fdad..0000000000000000000000000000000000000000
--- a/mojo/nacl/monacl_shell_nonsfi.cc
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include <fcntl.h>
-#include <iostream>
-
-#include "mojo/edk/embedder/embedder.h"
-#include "mojo/edk/embedder/simple_platform_support.h"
-#include "mojo/nacl/irt_mojo_nonsfi.h"
-#include "native_client/src/public/irt_core.h"
-#include "native_client/src/public/nonsfi/elf_loader.h"
-
-int main(int argc, char** argv, char** environ) {
- nacl_irt_nonsfi_allow_dev_interfaces();
- if (argc < 2) {
- std::cerr << "Usage: " << argv[0] << " <executable> <args...>\n";
- return 1;
- }
- const char* nexe_filename = argv[1];
- int fd = open(nexe_filename, O_RDONLY);
- if (fd < 0) {
- std::cerr << "Failed to open " << nexe_filename << ": " <<
- strerror(errno) << "\n";
- return 1;
- }
- uintptr_t entry = NaClLoadElfFile(fd);
-
- // TODO(vtl): Use make_unique when C++14 is available.
- mojo::embedder::Init(std::unique_ptr<mojo::embedder::PlatformSupport>(
- new mojo::embedder::SimplePlatformSupport()));
-
- return nacl_irt_nonsfi_entry(argc - 1, argv + 1, environ,
- reinterpret_cast<nacl_entry_func_t>(entry),
- nacl::MojoIrtNonsfiQuery);
-}
« no previous file with comments | « mojo/nacl/monacl_shell.cc ('k') | mojo/nacl/nexe_launcher_nonsfi.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698