From 4352d808360bf3b23502e00dc1f74d68ddf4c8aa Mon Sep 17 00:00:00 2001
From: Monte Goulding <monte@appisle.net>
Date: Wed, 17 May 2017 16:35:35 +1000
Subject: [PATCH 1/2] Fix target arch check for neon optimizations

---
 libskia/libskia.gyp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libskia/libskia.gyp b/libskia/libskia.gyp
index f2301c39..243e9f67 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/':
                         [

From 9cec71a6df7e7a2cc6e53b92a3d934efde8f1f59 Mon Sep 17 00:00:00 2001
From: Monte Goulding <monte@appisle.net>
Date: Wed, 17 May 2017 17:13:33 +1000
Subject: [PATCH 2/2] Add crc32 opts for arm64

---
 libskia/libskia.gyp | 10 ++++++++++
 1 file changed, 10 insertions(+)

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