Merge pull request #98 from montegoulding/fixtargetarch

Fix iOS builds

Author: livecodepanos

libskia/libskia.gyp

@@ -1689,14 +1689,24 @@
 					},
 				],
                 [
-                    'target_arch in ("armv7", "arm64")',
+                    'target_arch in ("armv7", "arm64", "armv7 arm64")',
                     {
                         'sources/':
                         [
                             # Enable NEON optimisations
                             ['include', 'opts/.+_(arm|neon|NEON).*'],
                         ],
                     },
+                ],
+				[
+                    'target_arch in ("arm64", "armv7 arm64")',
+                    {
+                        'sources/':
+                        [
+                            # Enable crc32 optimisations
+                            ['include', 'opts/.+_crc32.*'],
+                        ],
+                    },
                 ],
 				[
 					'OS == "win"',