Introduce arm_version to allow building for armv5, v6 or v7.

skia/skia.gyp

Index: skia/skia.gyp
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 7712b929e3795a867af0b0ba68afa83713b1601a..452c1b82a4a86ba3d5cbee42b4222e7ba33fdbbb 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -340,12 +340,7 @@
         [ 'OS != "win"', {
           'sources/': [ ['exclude', '_win\\.(cc|cpp)$'] ],
         }],
-        [ 'armv7 == 1', {
-          'defines': [
-            '__ARM_ARCH__=7',
-          ],
-        }],
-        [ 'armv7 == 1 and arm_neon == 1', {
+        [ 'arm_version >= 7 and arm_neon == 1', {
           'defines': [
             '__ARM_HAVE_NEON',
           ],
@@ -671,12 +666,7 @@
         }],
         [ 'target_arch == "arm"', {
           'conditions': [
-            [ 'armv7 == 1', {
-              'defines': [
-                '__ARM_ARCH__=7',
-              ],
-            }],
-            [ 'armv7 == 1 and arm_neon == 1', {
+            [ 'arm_version >= 7 and arm_neon == 1', {
               'defines': [
                 '__ARM_HAVE_NEON',
               ],
@@ -705,12 +695,12 @@
             '../third_party/skia/src/opts/SkBitmapProcState_opts_arm.cpp',
           ],
         }],
-        [ 'armv7 == 1 and arm_neon == 0', {
+        [ 'target_arch == "arm" and (arm_version < 7 or arm_neon == 0)', {
           'sources': [
             '../third_party/skia/src/opts/memset.arm.S',
         ],
         }],
-        [ 'armv7 == 1 and arm_neon == 1', {
+        [ 'target_arch == "arm" and arm_version >= 7 and arm_neon == 1', {
           'sources': [
             '../third_party/skia/src/opts/memset16_neon.S',
             '../third_party/skia/src/opts/memset32_neon.S',
@@ -721,13 +711,13 @@
             '../third_party/skia/src/opts/SkBlitRow_opts_arm_neon.cpp',
           ],
         }],
-        [ 'target_arch == "arm" and armv7 == 0', {
+        [ 'target_arch == "arm" and arm_version < 6', {
           'sources': [
             '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp',
             '../third_party/skia/src/opts/SkUtils_opts_none.cpp',
           ],
         }],
-        [ 'target_arch == "arm" and armv7 == 1', {
+        [ 'target_arch == "arm" and arm_version >= 6', {
           'sources': [
             '../third_party/skia/src/opts/SkBlitRow_opts_arm.cpp',
             '../third_party/skia/src/opts/SkBlitRow_opts_arm.h',