ARM Skia NEON patches - 10 - ARM build

gyp/common_conditions.gypi

Index: gyp/common_conditions.gypi
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index 4aa503d7575266aa11ebd0b3420fcbf0d14b2fc6..bf30de6f6a1bb6ae97d09fee145e93dae61b23bf 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -17,6 +17,7 @@
         ],
       },
     ],
+
     [ 'skia_os == "win"',
       {
         'defines': [
@@ -126,6 +127,56 @@
       },
     ],
 
+    # The following section is common to linux + derivatives and android
+    [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos", "android"]',
+      {
+        'conditions': [
+          [ 'skia_warnings_as_errors', {
+            'cflags': [
+              '-Werror',
+            ],
+          }],
+          [ 'skia_arch_type == "arm" and arm_thumb == 1', {
+            'cflags': [
+              '-mthumb',
+            ],
+          }],
+          [ 'skia_arch_type == "arm" and armv7 == 1', {
+            'variables': {
+              'arm_neon_optional%': 0,
+            },
+            'defines': [
+              '__ARM_ARCH__=7',
+            ],
+            'cflags': [
+              '-march=armv7-a',
+              '-mfloat-abi=softfp',
+            ],
+            'conditions': [
+              [ 'arm_neon == 1', {
+                'defines': [
+                  '__ARM_HAVE_NEON',
+                ],
+                'cflags': [
+                  '-mfpu=neon',
+                ],
+                'ldflags': [
+                  '-march=armv7-a',
+                  '-Wl,--fix-cortex-a8',
+                ],
+              }],
+              [ 'arm_neon_optional == 1', {
+                'defines': [
+                  '__ARM_HAVE_OPTIONAL_NEON_SUPPORT',
+                ],
+              }],
+            ],
+          }],
+        ],
+      },
+    ],
+
+
     [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"]',
       {
         'defines': [
@@ -163,11 +214,6 @@
               'SKIA_IMPLEMENTATION=1',
             ],
           }],
-          [ 'skia_warnings_as_errors', {
-            'cflags': [
-              '-Werror',
-            ],
-          }],
           [ 'skia_os == "nacl"', {
             'defines': [
               'SK_BUILD_FOR_NACL',
@@ -192,7 +238,7 @@
             ],
           }, {
             'conditions': [
-              [ 'skia_arch_width == 64', {
+              [ 'skia_arch_width == 64 and skia_arch_type == "x86"', {
                 'cflags': [
                   '-m64',
                 ],
@@ -200,7 +246,7 @@
                   '-m64',
                 ],
               }],
-              [ 'skia_arch_width == 32', {
+              [ 'skia_arch_width == 32 and skia_arch_type == "x86"', {
                 'cflags': [
                   '-m32',
                 ],
@@ -365,14 +411,6 @@
           '-fno-rtti',
         ],
         'conditions': [
-          [ 'skia_warnings_as_errors', {
-            'cflags': [
-              '-Werror',
-            ],
-          }],
-          [ 'skia_profile_enabled == 1', {
-            'cflags': ['-g', '-fno-omit-frame-pointer', '-marm', '-mapcs'],
-          }],
           [ 'skia_shared_lib', {
             'cflags': [
               '-fPIC',
@@ -384,42 +422,9 @@
               'SKIA_IMPLEMENTATION=1',
             ],
           }],
-          [ 'skia_arch_type == "arm" and arm_thumb == 1', {
-            'cflags': [
-              '-mthumb',
-            ],
+          [ 'skia_profile_enabled == 1', {
+            'cflags': ['-g', '-fno-omit-frame-pointer', '-marm', '-mapcs'],
           }],
-          [ 'skia_arch_type == "arm" and armv7 == 1', {
-            'variables': {
-              'arm_neon_optional%': 0,
-            },
-            'defines': [
-              '__ARM_ARCH__=7',
-            ],
-            'cflags': [
-              '-march=armv7-a',
-              '-mfloat-abi=softfp',
-            ],
-            'conditions': [
-              [ 'arm_neon == 1', {
-                'defines': [
-                  '__ARM_HAVE_NEON',
-                ],
-                'cflags': [
-                  '-mfpu=neon',
-                ],
-                'ldflags': [
-                  '-march=armv7-a',
-                  '-Wl,--fix-cortex-a8',
-                ],
-              }],
-              [ 'arm_neon_optional == 1', {
-                'defines': [
-                  '__ARM_HAVE_OPTIONAL_NEON_SUPPORT',
-                ],
-              }],
-            ],
-         }],
         ],
       },
     ],