Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3272)

Unified Diff: build/common.gypi

Issue 8905007: Put irt and untrusted TC dependencies behind a flag. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/chrome_exe.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
===================================================================
--- build/common.gypi (revision 114228)
+++ build/common.gypi (working copy)
@@ -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,
« no previous file with comments | « no previous file | chrome/chrome_exe.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698