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

Unified Diff: ppapi/nacl_irt/irt_start.cc

Issue 652393003: Non-SFI mode: Build ppapi libraries for nacl_helper_nonsfi. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 side-by-side diff with in-line comments
Download patch
Index: ppapi/nacl_irt/irt_start.cc
diff --git a/ppapi/nacl_irt/irt_start.cc b/ppapi/nacl_irt/irt_start.cc
index f184fa604c39fcc6ffc54444230ec281c9574f7c..f199de1383be730e1446c09f16e9c4f775539015 100644
--- a/ppapi/nacl_irt/irt_start.cc
+++ b/ppapi/nacl_irt/irt_start.cc
@@ -2,6 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "build/build_config.h"
+
+// We need nacl_irt_start injection in SFI mode. Non-SFI has a different
+// start up procedure so we just exclude it.
+#if defined(OS_NACL_SFI)
+
#include "base/at_exit.h"
#include "native_client/src/public/chrome_main.h"
#include "native_client/src/public/irt_core.h"
@@ -24,3 +30,5 @@ void nacl_irt_start(uint32_t* info) {
nacl_irt_enter_user_code(info, chrome_irt_query);
}
+
+#endif // defined(OS_NACL_SFI)

Powered by Google App Engine
This is Rietveld 408576698