Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index c90d15bb9bae08d61d7e26631751e6588b31f27c..9d4d6b5684829b448f12c690400de98123305570 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -724,14 +724,10 @@ |
# The desired version of Windows SDK can be set in ~/.gyp/include.gypi. |
'msbuild_toolset%': '', |
+ # Native Client is enabled by default. |
robertm
2012/03/28 14:22:14
Are the chrome-os bots explicitly setting
disable
Nikolay
2012/03/28 14:31:08
Yes, they do disable nacl in .ebuild files (see us
|
+ 'disable_nacl%': 0, |
+ |
'conditions': [ |
- # Used to disable Native Client at compile time, for platforms where it |
- # isn't supported (ARM) |
- ['target_arch=="arm" and chromeos == 1', { |
- 'disable_nacl%': 1, |
- }, { |
- 'disable_nacl%': 0, |
- }], |
['os_posix==1 and OS!="mac" and OS!="android"', { |
# This will set gcc_version to XY if you are running gcc X.Y.*. |
# This is used to tweak build flags for gcc 4.4. |