| Index: build/common.gypi | 
| diff --git a/build/common.gypi b/build/common.gypi | 
| index 734c9e78d4aba89411ec70873c804e7408db1460..7772b76928ded567209d83201da2dc78e930307a 100644 | 
| --- a/build/common.gypi | 
| +++ b/build/common.gypi | 
| @@ -527,15 +527,6 @@ | 
| 'os_bsd%': 0, | 
| }], | 
|  | 
| -        # Set armv7 for backward compatibility. | 
| -        # TODO(mostynb@opera.com): remove armv7 once all uses are | 
| -        # removed http://crbug.com/234135 | 
| -        ['arm_version==7', { | 
| -          'armv7': 1, | 
| -        }, { | 
| -          'armv7': 0, | 
| -        }], | 
| - | 
| # NSS usage. | 
| ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and use_openssl==0', { | 
| 'use_nss%': 1, | 
| @@ -914,7 +905,6 @@ | 
| 'tracing_like_official_build%': '<(tracing_like_official_build)', | 
| 'python_ver%': '<(python_ver)', | 
| 'arm_version%': '<(arm_version)', | 
| -    'armv7%': '<(armv7)', | 
| 'arm_neon%': '<(arm_neon)', | 
| 'arm_neon_optional%': '<(arm_neon_optional)', | 
| 'sysroot%': '<(sysroot)', | 
|  |