| Index: build/common.gypi
|
| diff --git a/build/common.gypi b/build/common.gypi
|
| index 17dac2a082832eabf8f4dfa63e488da34132dc76..72edb9dd0f69e88e8ec48ef0b587e1df6d6b60d4 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,6 +1769,7 @@
|
| 'arm_fpu%': 'vfpv3-d16',
|
| }],
|
| ],
|
| + # Change the default to hard once the armhf transition is complete.
|
| 'arm_float_abi%': 'softfp',
|
| 'arm_thumb%': 1,
|
| }],
|
|
|