ARM Skia NEON patches - 10 - ARM build

gyp/common_conditions.gypi

 # conditions used in both common.gypi and skia.gyp in chromium
 #
 {
   'defines': [
     'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)',
 #    'SK_SUPPORT_HINTING_SCALE_FACTOR',
   ],
   'conditions' : [
     [ 'skia_gpu == 1',
       {
         'defines': [
           'SK_SUPPORT_GPU=1',
         ],
       }, {
         'defines': [
           'SK_SUPPORT_GPU=0',
         ],
       },
     ],
+
     [ 'skia_os == "win"',
       {
         'defines': [
           'SK_BUILD_FOR_WIN32',
           'SK_IGNORE_STDINT_DOT_H',
           '_CRT_SECURE_NO_WARNINGS',
           'GR_GL_FUNCTION_TYPE=__stdcall',
         ],
         'msvs_cygwin_shell': 0,
         'msvs_settings': {
@@ skipping 89 matching lines @@
                 'AdditionalOptions': [
                   '/EHsc',
                 ],
               },
             },
           }],
         ],
       },
     ],
 
+    # 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': [
           'SK_SAMPLES_FOR_X',
           'SK_BUILD_FOR_UNIX',
         ],
         'configurations': {
           'Debug': {
             'cflags': ['-g']
           },
@@ skipping 17 matching lines @@
             'cflags': [
               '-fPIC',
             ],
             'defines': [
               'GR_DLL=1',
               'GR_IMPLEMENTATION=1',
               'SKIA_DLL',
               'SKIA_IMPLEMENTATION=1',
             ],
           }],
-          [ 'skia_warnings_as_errors', {
-            'cflags': [
-              '-Werror',
-            ],
-          }],
           [ 'skia_os == "nacl"', {
             'defines': [
               'SK_BUILD_FOR_NACL',
             ],
             'link_settings': {
               'libraries': [
                 '-lppapi',
                 '-lppapi_cpp',
                 '-lnosys',
                 '-pthread',
               ],
             },
           }, { # skia_os != "nacl"
             'include_dirs' : [
               '/usr/include/freetype2',
             ],
           }],
           [ 'skia_os == "chromeos"', {
             'ldflags': [
               '-lstdc++',
               '-lm',
             ],
           }, {
             'conditions': [
-              [ 'skia_arch_width == 64', {
+              [ 'skia_arch_width == 64 and skia_arch_type == "x86"', {
                 'cflags': [
                   '-m64',
                 ],
                 'ldflags': [
                   '-m64',
                 ],
               }],
-              [ 'skia_arch_width == 32', {
+              [ 'skia_arch_width == 32 and skia_arch_type == "x86"', {
                 'cflags': [
                   '-m32',
                 ],
                 'ldflags': [
                   '-m32',
                 ],
               }],
             ],
           }],
         ],
@@ skipping 144 matching lines @@
         'cflags': [
           '-Wall',
           '-fno-exceptions',
           '-fstrict-aliasing',
           '-fuse-ld=gold',
         ],
         'cflags_cc': [
           '-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',
             ],
             'defines': [
               'GR_DLL=1',
               'GR_IMPLEMENTATION=1',
               'SKIA_DLL',
               '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',
-                ],
-              }],
-            ],
-         }],
         ],
       },
     ],
 
     # We can POD-style initialization of static mutexes to avoid generating
     # static initializers if we're using a pthread-compatible thread interface.
     [ 'skia_os != "win"', {
       'defines': [
         'SK_USE_POSIX_THREADS',
       ],
     }],
   ], # end 'conditions'
   # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
   'xcode_settings': {
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: