diff options
| author | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-16 23:45:06 +0000 |
|---|---|---|
| committer | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-16 23:45:06 +0000 |
| commit | 8e9424b48974b88422d873dab17058f53506437a (patch) | |
| tree | 2d69e47b5d27dec3025a32ca7ad9870a1dc30ff8 /chrome/nacl.gypi | |
| parent | 3deb30324e1fde3a8374cfbbad7bf32a07abae8b (diff) | |
| download | chromium_src-8e9424b48974b88422d873dab17058f53506437a.zip chromium_src-8e9424b48974b88422d873dab17058f53506437a.tar.gz chromium_src-8e9424b48974b88422d873dab17058f53506437a.tar.bz2 | |
Revert 97056 - Gyp fix for release build.
Reserve 1GB at the base of the address space of linux nacl_helper for Native Client module. Use PathService instead of command line flag to enable helper. Adds a nacl_helper_bootstrap executable that implements the actual space reservation.
See http://codereview.chromium.org/7599011 for extended revision history. This is a gyp fix following a revert.
TBR=agl,bradnelson
BUG=92964, nativeclient:480
TEST=manual for now
Review URL: http://codereview.chromium.org/7670011
TBR=bradchen@google.com
Review URL: http://codereview.chromium.org/7671011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97058 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/nacl.gypi')
| -rw-r--r-- | chrome/nacl.gypi | 34 |
1 files changed, 2 insertions, 32 deletions
diff --git a/chrome/nacl.gypi b/chrome/nacl.gypi index 20519eb..9467359 100644 --- a/chrome/nacl.gypi +++ b/chrome/nacl.gypi @@ -144,12 +144,10 @@ }, ], }], - ['OS=="linux"', { + ['OS=="linux" and touchui == 0', { 'targets': [ { - 'target_name': 'nacl_helper.so', - # 'executable' will be overridden below when we add the -shared - # flag; here it prevents gyp from using the --whole-archive flag + 'target_name': 'nacl_helper', 'type': 'executable', 'include_dirs': [ '..', @@ -167,34 +165,6 @@ ], }], ], - 'link_settings': { - # NOTE: '-shared' overrides 'executable' above - 'ldflags': ['-shared', - '-Wl,--version-script=chrome/nacl/nacl_helper_exports.txt', - ], - }, - }, - { - 'target_name': 'nacl_helper_bootstrap', - 'type': 'executable', - 'dependencies': [ - 'nacl_helper.so', - ], - 'sources': [ - '../chrome/nacl/nacl_helper_bootstrap_linux.c', - ], - # TODO(bradchen): Delete the -B argument when Gold supports - # -Ttext properly. Until then use ld.bfd. - 'link_settings': { - 'ldflags': ['-B', 'tools/ld_bfd', - # Force text segment at 0x10000 (64KB) - # The max-page-size option is needed on x86-64 linux - # where 4K pages are not the default in the BFD linker. - '-Wl,-Ttext-segment,10000,-z,max-page-size=0x1000', - # reference nacl_helper as a shared library - '<(PRODUCT_DIR)/nacl_helper.so', - ], - }, }, ], }], |