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

Side by Side Diff: mojo/nacl/monacl_shell.cc

Issue 621153003: Move mojo edk into mojo/edk (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix checkdeps Created 6 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 unified diff | Download patch
« no previous file with comments | « mojo/mojo_base.gyp ('k') | mojo/public/c/system/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <iostream> 5 #include <iostream>
6 6
7 #include "mojo/embedder/embedder.h" 7 #include "mojo/edk/embedder/embedder.h"
8 #include "mojo/embedder/simple_platform_support.h" 8 #include "mojo/edk/embedder/simple_platform_support.h"
9 #include "mojo/nacl/monacl_sel_main.h" 9 #include "mojo/nacl/monacl_sel_main.h"
10 10
11 11
12 int main(int argc, char* argv[]) { 12 int main(int argc, char* argv[]) {
13 if (argc < 3) { 13 if (argc < 3) {
14 std::cout << "Usage: " << argv[0] << " irt.nexe app.nexe [args for app]" << 14 std::cout << "Usage: " << argv[0] << " irt.nexe app.nexe [args for app]" <<
15 std::endl; 15 std::endl;
16 return 1; 16 return 1;
17 } 17 }
18 18
19 const char* irt_file = argv[1]; 19 const char* irt_file = argv[1];
20 const char* nexe_file = argv[2]; 20 const char* nexe_file = argv[2];
21 21
22 mojo::embedder::Init(scoped_ptr<mojo::embedder::PlatformSupport>( 22 mojo::embedder::Init(scoped_ptr<mojo::embedder::PlatformSupport>(
23 new mojo::embedder::SimplePlatformSupport())); 23 new mojo::embedder::SimplePlatformSupport()));
24 24
25 // Does not return. 25 // Does not return.
26 mojo::LaunchNaCl(nexe_file, irt_file, argc - 2, argv + 2); 26 mojo::LaunchNaCl(nexe_file, irt_file, argc - 2, argv + 2);
27 return 1; 27 return 1;
28 } 28 }
OLDNEW
« no previous file with comments | « mojo/mojo_base.gyp ('k') | mojo/public/c/system/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698