summaryrefslogtreecommitdiffstats
path: root/native_client_sdk/src
diff options
context:
space:
mode:
authorsbc <sbc@chromium.org>2015-02-27 17:54:27 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-28 01:55:00 +0000
commit918b8195c559db1316fd6b1c961324cd0a53721a (patch)
treeed98052008823c0ca451711f7cf2089325a4074b /native_client_sdk/src
parent6b2d16b5072558e38155bb727e4de041e176aac8 (diff)
downloadchromium_src-918b8195c559db1316fd6b1c961324cd0a53721a.zip
chromium_src-918b8195c559db1316fd6b1c961324cd0a53721a.tar.gz
chromium_src-918b8195c559db1316fd6b1c961324cd0a53721a.tar.bz2
[NaCl SDK] ppapi_simple: Don't initialize nacl_io when running in sel_ldr
When running ppapi_simple-based application in sel_ldr we almost never want to use nacl_io so don't initialize it by default. This makes it easier for application build on ppapi_simple to run both under and Chrome and sel_ldr. Review URL: https://codereview.chromium.org/964983002 Cr-Commit-Position: refs/heads/master@{#318569}
Diffstat (limited to 'native_client_sdk/src')
-rw-r--r--native_client_sdk/src/libraries/ppapi_simple/ps_main.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/native_client_sdk/src/libraries/ppapi_simple/ps_main.c b/native_client_sdk/src/libraries/ppapi_simple/ps_main.c
index fd3602a..3923574 100644
--- a/native_client_sdk/src/libraries/ppapi_simple/ps_main.c
+++ b/native_client_sdk/src/libraries/ppapi_simple/ps_main.c
@@ -37,10 +37,5 @@ int main(int argc, char* argv[]) {
#endif
// By default, or if not running in the browser we simply run the main
// entry point directly, on the main thread.
- int rtn = nacl_io_init();
- if (rtn != 0)
- return rtn;
- rtn = PSUserMainGet()(argc, argv);
- nacl_io_uninit();
- return rtn;
+ return PSUserMainGet()(argc, argv);
}