diff options
| author | sehr@chromium.org <sehr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-04 15:39:58 +0000 |
|---|---|---|
| committer | sehr@chromium.org <sehr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-04 15:39:58 +0000 |
| commit | d33d2224a994adfba4a55eb8d47706bbc67ff418 (patch) | |
| tree | 07646dd9397252a436c42ef091c89c2ad5c3dad4 /build/common.gypi | |
| parent | 1c44dae3bc0bd914b98c8217784840d4eef714ac (diff) | |
| download | chromium_src-d33d2224a994adfba4a55eb8d47706bbc67ff418.zip chromium_src-d33d2224a994adfba4a55eb8d47706bbc67ff418.tar.gz chromium_src-d33d2224a994adfba4a55eb8d47706bbc67ff418.tar.bz2 | |
Gate disabling nacl code on proper gyp flags, etc.
Background: I am currently trying to test NaCl in clank by setting disable_nacl=0 and enable_plugins=1 in gyp. Some of the code required to get this to work is guarded under overly-specific OS==android and similar constructs. This first CL enables a coherent build with the flags set to gyp, but does not yet turn the functionality on completely. A sampling of issues fixed:
1) std:: prefix is more strictly observed on android
2) define NACL_LINUX, etc., is needed for nacl code
3) properly guard flag-setting code
BUG= https://code.google.com/p/nativeclient/issues/detail?id=3032
R=bradnelson@google.com, darin@chromium.org
Review URL: https://codereview.chromium.org/299703016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274839 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/common.gypi')
| -rw-r--r-- | build/common.gypi | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/build/common.gypi b/build/common.gypi index dc8517a..941f4cc 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -982,6 +982,8 @@ 'google_api_key%': '', 'google_default_client_id%': '', 'google_default_client_secret%': '', + # Native Client is enabled by default. + 'disable_nacl%': '0', }, # Copy conditionally-set variables out one scope. @@ -1347,8 +1349,8 @@ # Disable Dart by default. 'enable_dart%': 0, - # Native Client is enabled by default. - 'disable_nacl%': 0, + # Copy out the setting of disable_nacl. + 'disable_nacl%': '<(disable_nacl)', # Portable Native Client is enabled by default. 'disable_pnacl%': 0, |