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

Unified Diff: SConstruct

Issue 539683002: MinSFI: Add loader (Closed) Base URL: https://chromium.googlesource.com/native_client/src/native_client.git@master
Patch Set: Created 6 years, 3 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 | « no previous file | site_scons/site_tools/naclsdk.py » ('j') | site_scons/site_tools/naclsdk.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: SConstruct
diff --git a/SConstruct b/SConstruct
index ab58f1dc8d671ad7ecb68a45e5e27d196a24ff34..e15876df25ee1bad58e873c55996b074d749a397 100755
--- a/SConstruct
+++ b/SConstruct
@@ -330,6 +330,9 @@ def SetUpArgumentBits(env):
BitFromArgument(env, 'pnacl_unsandboxed', default=False,
desc='Translate pexe to an unsandboxed, host executable')
+ BitFromArgument(env, 'minsfi', default=env.Bit('bitcode'),
+ desc='Run MinSFI tests')
+
BitFromArgument(env, 'nonsfi_nacl', default=False,
desc='Use Non-SFI Mode instead of the original SFI Mode. This uses '
'nonsfi_loader instead of sel_ldr, and it tells the PNaCl toolchain '
@@ -2206,6 +2209,7 @@ def MakeBaseTrustedEnv(platform=None):
# KEEP THIS SORTED PLEASE
'build/package_version/build.scons',
'pynacl/build.scons',
+ 'src/minsfi/trusted/build.scons',
'src/nonsfi/irt/build.scons',
'src/nonsfi/loader/build.scons',
'src/shared/gio/build.scons',
@@ -3302,6 +3306,7 @@ irt_variant_tests = [
'tests/mandel/nacl.scons',
'tests/math/nacl.scons',
'tests/memcheck_test/nacl.scons',
+ 'tests/minsfi/nacl.scons',
'tests/mmap/nacl.scons',
'tests/mmap_main_nexe/nacl.scons',
'tests/mmap_prot_exec/nacl.scons',
« no previous file with comments | « no previous file | site_scons/site_tools/naclsdk.py » ('j') | site_scons/site_tools/naclsdk.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698