diff options
| author | bradchen@google.com <bradchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-28 18:32:33 +0000 |
|---|---|---|
| committer | bradchen@google.com <bradchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-28 18:32:33 +0000 |
| commit | 0e0e9b100f7c66eaf74bebb6048fa70a361d4629 (patch) | |
| tree | f783dbefd213a5873a09a57dbb2a76c5ad7856e9 /chrome/nacl.gypi | |
| parent | f4455c16ed296ab630db75b017d5c1ddea80c736 (diff) | |
| download | chromium_src-0e0e9b100f7c66eaf74bebb6048fa70a361d4629.zip chromium_src-0e0e9b100f7c66eaf74bebb6048fa70a361d4629.tar.gz chromium_src-0e0e9b100f7c66eaf74bebb6048fa70a361d4629.tar.bz2 | |
I am submitting this with LGTMs from agl@ and evanm@. I'm marking this as TBR=jam@ because he is on vacation. He previously LGTMed the reverted CL (link below) and there are not substantive changes since then.
Modify the Chrome Linux zygote to support a nacl_helper executable,
facilitating a special address-space layout as required by NaCl on ARM
and ATOM CPUs. In passing, simplify some shared elements of launching
NaCl modules in Chrome.
This is an update to a previously reverted CL. Please see
http://codereview.chromium.org/6995121 for the earlier reviews.
Patching nacl_helper CL into fresh branch.
BUG=nativeclient:480
TEST=nativeclient in-browser tests
TBR=jam@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90805 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', + ], + }, + ], + }], ], } |