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 /chrome/nacl.gypi | |
| 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 'chrome/nacl.gypi')
| -rw-r--r-- | chrome/nacl.gypi | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/nacl.gypi b/chrome/nacl.gypi index 32d1d5a..0ab96d4 100644 --- a/chrome/nacl.gypi +++ b/chrome/nacl.gypi @@ -70,12 +70,18 @@ 'chrome_resources.gyp:chrome_resources', 'chrome_resources.gyp:chrome_strings', 'common', - '../ppapi/native_client/native_client.gyp:nacl_irt', '../webkit/support/webkit_support.gyp:glue', '../ppapi/native_client/src/trusted/plugin/plugin.gyp:ppGoogleNaClPluginChrome', '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel', '../native_client/src/trusted/platform_qualify/platform_qualify.gyp:platform_qual_lib', ], + 'conditions': [ + ['disable_nacl_untrusted==0', { + 'dependencies': [ + '../ppapi/native_client/native_client.gyp:nacl_irt', + ], + }], + ], 'direct_dependent_settings': { 'defines': [ 'NACL_BLOCK_SHIFT=5', |