diff --git a/libskia/libskia.gyp b/libskia/libskia.gyp
index f2301c39..766d83c8 100644
--- a/libskia/libskia.gyp
+++ b/libskia/libskia.gyp
@@ -1689,7 +1689,7 @@
 					},
 				],
                 [
-                    'target_arch in ("armv7", "arm64")',
+                    'target_arch in ("armv7", "arm64", "armv7 arm64")',
                     {
                         'sources/':
                         [
@@ -1697,6 +1697,16 @@
                             ['include', 'opts/.+_(arm|neon|NEON).*'],
                         ],
                     },
+                ],
+				[
+                    'target_arch in ("arm64", "armv7 arm64")',
+                    {
+                        'sources/':
+                        [
+                            # Enable crc32 optimisations
+                            ['include', 'opts/.+_crc32.*'],
+                        ],
+                    },
                 ],
 				[
 					'OS == "win"',