diff options
| author | bradchen@google.com <bradchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-27 23:50:40 +0000 |
|---|---|---|
| committer | bradchen@google.com <bradchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-27 23:50:40 +0000 |
| commit | 5b99724ed67011e9ef4231ec2796a5237cdf8e88 (patch) | |
| tree | f463db20eff57bcb29e32564610b0389597ea1a2 /chrome/nacl.gypi | |
| parent | 95343df7917bc58e87e6455449fbfa2461ceb37c (diff) | |
| download | chromium_src-5b99724ed67011e9ef4231ec2796a5237cdf8e88.zip chromium_src-5b99724ed67011e9ef4231ec2796a5237cdf8e88.tar.gz chromium_src-5b99724ed67011e9ef4231ec2796a5237cdf8e88.tar.bz2 | |
New NaCl zygote implementation 2, in which Chrome zygote forks a NaCl helper.
This patch can launch earth_c.html with and without the SUID sandbox. It is enabled with the environment variable NACL_NEW_ZYGOTE.
BUG=nativeclient:480
TEST=nativeclient in-browser tests on Linux, ChromeOS
Review URL: http://codereview.chromium.org/6995121
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90681 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/nacl.gypi')
| -rw-r--r-- | chrome/nacl.gypi | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/chrome/nacl.gypi b/chrome/nacl.gypi index 9b7e6b4..21fbb01 100644 --- a/chrome/nacl.gypi +++ b/chrome/nacl.gypi @@ -28,8 +28,8 @@ 'nacl/nacl_main_platform_delegate_linux.cc', 'nacl/nacl_main_platform_delegate_mac.mm', 'nacl/nacl_main_platform_delegate_win.cc', - 'nacl/nacl_launcher_thread.cc', - 'nacl/nacl_launcher_thread.h', + 'nacl/nacl_listener.cc', + 'nacl/nacl_listener.h', ], # TODO(gregoryd): consider switching NaCl to use Chrome OS defines 'conditions': [ @@ -45,6 +45,9 @@ 'defines': [ '__STDC_LIMIT_MACROS=1', ], + 'sources': [ + 'nacl/nacl_fork_delegate_linux.cc', + ], },], ], }], @@ -141,5 +144,22 @@ }, ], }], + ['OS=="linux"', { + 'targets': [ + { + 'target_name': 'nacl_helper', + 'type': 'executable', + 'include_dirs': [ + '..', + ], + 'dependencies': [ + 'nacl', + ], + 'sources': [ + '../chrome/nacl/nacl_helper_linux.cc', + ], + }, + ], + }], ], } |