diff options
| author | bradchen@google.com <bradchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-17 15:30:13 +0000 |
|---|---|---|
| committer | bradchen@google.com <bradchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-17 15:30:13 +0000 |
| commit | 34169bda0e64aa826c113c0bed199f8469736f75 (patch) | |
| tree | 9f12d961ac1416cc9fdb8a367856ea97340d4261 /chrome/common/chrome_paths.h | |
| parent | b967a1b2bc8ae2c714a3c692cf086fdf7815e9eb (diff) | |
| download | chromium_src-34169bda0e64aa826c113c0bed199f8469736f75.zip chromium_src-34169bda0e64aa826c113c0bed199f8469736f75.tar.gz chromium_src-34169bda0e64aa826c113c0bed199f8469736f75.tar.bz2 | |
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.
This is for resubmit of reverted CL 7670011, fixing nacl.gypi for the linux_shared build.
See 7670011 and 7599011 for review history.
TBR=agl,bradnelson
BUG=92964, nativeclient:480
TEST=manual for now
Review URL: http://codereview.chromium.org/7655010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97137 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/chrome_paths.h')
| -rw-r--r-- | chrome/common/chrome_paths.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/common/chrome_paths.h b/chrome/common/chrome_paths.h index 43140ea..4998213 100644 --- a/chrome/common/chrome_paths.h +++ b/chrome/common/chrome_paths.h @@ -40,7 +40,7 @@ enum { // using it. DIR_INTERNAL_PLUGINS, // Directory where internal plugins reside. DIR_MEDIA_LIBS, // Directory where the Media libraries reside. -#if !defined(OS_MACOSX) && defined(OS_POSIX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) DIR_POLICY_FILES, // Directory for system-wide read-only // policy files that allow sys-admins // to set policies for chrome. This directory @@ -68,6 +68,10 @@ enum { FILE_FLASH_PLUGIN, // Full path to the internal Flash plugin file. FILE_PEPPER_FLASH_PLUGIN, // Full path to the pepper Flash plugin file. FILE_PDF_PLUGIN, // Full path to the internal PDF plugin file. + +#if defined(OS_POSIX) && !defined(OS_MACOSX) + FILE_NACL_HELPER, // Full path to Linux nacl_helper executable. +#endif FILE_NACL_PLUGIN, // Full path to the internal NaCl plugin file. FILE_LIBAVCODEC, // Full path to libavcodec media decoding // library. |