diff options
| author | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-28 19:06:46 +0000 |
|---|---|---|
| committer | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-28 19:06:46 +0000 |
| commit | 2b64f7b0cb8c3a1cb9cc8b618a4c9ddaf2af859a (patch) | |
| tree | ade68b35681035ecf8afe89618b18af1797cc0b8 /chrome/nacl.gypi | |
| parent | 97762c74a812d0ed2028fa9397746fe17597ef47 (diff) | |
| download | chromium_src-2b64f7b0cb8c3a1cb9cc8b618a4c9ddaf2af859a.zip chromium_src-2b64f7b0cb8c3a1cb9cc8b618a4c9ddaf2af859a.tar.gz chromium_src-2b64f7b0cb8c3a1cb9cc8b618a4c9ddaf2af859a.tar.bz2 | |
Revert 90805 - 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
TBR=bradchen@google.com
Review URL: http://codereview.chromium.org/7230057
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90813 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/nacl.gypi')
| -rw-r--r-- | chrome/nacl.gypi | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/chrome/nacl.gypi b/chrome/nacl.gypi index 21fbb01..9b7e6b4 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_listener.cc', - 'nacl/nacl_listener.h', + 'nacl/nacl_launcher_thread.cc', + 'nacl/nacl_launcher_thread.h', ], # TODO(gregoryd): consider switching NaCl to use Chrome OS defines 'conditions': [ @@ -45,9 +45,6 @@ 'defines': [ '__STDC_LIMIT_MACROS=1', ], - 'sources': [ - 'nacl/nacl_fork_delegate_linux.cc', - ], },], ], }], @@ -144,22 +141,5 @@ }, ], }], - ['OS=="linux"', { - 'targets': [ - { - 'target_name': 'nacl_helper', - 'type': 'executable', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - 'nacl', - ], - 'sources': [ - '../chrome/nacl/nacl_helper_linux.cc', - ], - }, - ], - }], ], } |