diff options
| author | robertm@google.com <robertm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-14 16:32:07 +0000 |
|---|---|---|
| committer | robertm@google.com <robertm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-14 16:32:07 +0000 |
| commit | 33e1c37730f7d404b61f8bed2eb768f9902b1b64 (patch) | |
| tree | 7c26da4c94d54a610a92a03e4cad6cb5d04232a1 /build | |
| parent | 808d151c8288688f9d6ff53ecd0a5b4e67a71c31 (diff) | |
| download | chromium_src-33e1c37730f7d404b61f8bed2eb768f9902b1b64.zip chromium_src-33e1c37730f7d404b61f8bed2eb768f9902b1b64.tar.gz chromium_src-33e1c37730f7d404b61f8bed2eb768f9902b1b64.tar.bz2 | |
Put irt and untrusted TC dependencies behind a flag.
This helps with arm development where the PNaCl hook up will take a while.
Also:
* split ppapi_proxy.gyp into trusted and untrusted parts.
* enable nacl for arm when *not* targeting chromeos
Review URL: http://codereview.chromium.org/8905007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114438 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi index 1670008..7efc5c7 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -623,10 +623,15 @@ # https://bugs.webkit.org/show_bug.cgi?id=68463. 'build_webkit_exes_from_webkit_gyp%': 1, + # This flag is only used when disable_nacl==0 and disables all those + # subcomponents which would require the installation of a native_client + # untrusted toolchain. + 'disable_nacl_untrusted%': 0, + 'conditions': [ # Used to disable Native Client at compile time, for platforms where it # isn't supported (ARM) - ['target_arch=="arm"', { + ['target_arch=="arm" and chromeos == 1', { 'disable_nacl%': 1, }, { 'disable_nacl%': 0, |