Chromium Code Reviews| Index: build/common.gypi |
| diff --git a/build/common.gypi b/build/common.gypi |
| index 17dac2a082832eabf8f4dfa63e488da34132dc76..151df0f1a8090d9c8d0341ae174948f8026a7d97 100644 |
| --- a/build/common.gypi |
| +++ b/build/common.gypi |
| @@ -225,7 +225,6 @@ |
| # Python version. |
| 'python_ver%': '2.6', |
| - |
| # Set NEON compilation flags. |
| 'arm_neon%': 1, |
| @@ -675,7 +674,6 @@ |
| 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/arm-sysroot', |
| }], # OS=="linux" and target_arch=="arm" and chromeos==0 |
| - |
| ['OS=="linux" and branding=="Chrome" and buildtype=="Official" and chromeos==0', { |
| 'conditions': [ |
| ['target_arch=="x64"', { |
| @@ -1771,7 +1769,9 @@ |
| 'arm_fpu%': 'vfpv3-d16', |
| }], |
| ], |
| - 'arm_float_abi%': 'softfp', |
| + # For ARM/linux builds we default to using the compilers default abi |
| + # (normally arm-linux-gnueabi-gcc or arm-linux-gnueabihf-gcc) |
|
Lei Zhang
2013/10/28 21:23:17
Mention the permissible values are soft, softfp an
|
| + 'arm_float_abi%': 'default', |
| 'arm_thumb%': 1, |
| }], |
| @@ -3065,7 +3065,7 @@ |
| '-mfpu=<(arm_fpu)', |
| ], |
| }], |
| - ['arm_float_abi!=""', { |
| + ['arm_float_abi!="" and arm_float_abi!="default"', { |
| 'cflags': [ |
| '-mfloat-abi=<(arm_float_abi)', |
| ], |