From 469722979287efda2031c1f1f8dfec8a7b696feb Mon Sep 17 00:00:00 2001
From: Sparticuz <kyle@dazser.com>
Date: Wed, 15 Jun 2022 09:00:42 -0400
Subject: [PATCH] Support building chromium for arm64

---
 _/amazon/template.yml        | 16 +++++++++++-----
 _/ansible/plays/.gclient     |  1 +
 _/ansible/plays/chromium.yml | 14 ++++++++++----
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/_/amazon/template.yml b/_/amazon/template.yml
index 29b833f..dbcd77d 100644
--- a/_/amazon/template.yml
+++ b/_/amazon/template.yml
@@ -9,11 +9,13 @@ Resources:
   layer:
     Type: AWS::Serverless::LayerVersion
     Properties:
-        LayerName: sparticuz-chrome-aws-lambda
-        ContentUri: code/
-        CompatibleRuntimes:
-          - nodejs14.x
-          - nodejs16.x
+      LayerName: schrome_arm
+      ContentUri: code/
+      CompatibleArchitectures:
+        - arm64
+      CompatibleRuntimes:
+        - nodejs14.x
+        - nodejs16.x
 
   node14:
     Type: AWS::Serverless::Function
@@ -22,6 +24,8 @@ Resources:
         - !Ref layer
       Handler: handlers/index.handler
       Runtime: nodejs14.x
+      Architectures:
+        - arm64
       Policies:
         - AWSLambdaBasicExecutionRole
         - AWSXRayDaemonWriteAccess
@@ -33,6 +37,8 @@ Resources:
         - !Ref layer
       Handler: handlers/index.handler
       Runtime: nodejs16.x
+      Architectures:
+        - arm64
       Policies:
         - AWSLambdaBasicExecutionRole
         - AWSXRayDaemonWriteAccess
diff --git a/_/ansible/plays/.gclient b/_/ansible/plays/.gclient
index decba8d..f9e376a 100644
--- a/_/ansible/plays/.gclient
+++ b/_/ansible/plays/.gclient
@@ -9,3 +9,4 @@ solutions = [
     },
   },
 ]
+target_cpu = ["arm64","x64"]
diff --git a/_/ansible/plays/chromium.yml b/_/ansible/plays/chromium.yml
index 8a75df7..446593c 100644
--- a/_/ansible/plays/chromium.yml
+++ b/_/ansible/plays/chromium.yml
@@ -293,11 +293,11 @@
           is_official_build = true
           proprietary_codecs = true
           symbol_level = 0
-          target_cpu = "x64"
+          target_cpu = "arm64"
           target_os = "linux"
           use_sysroot = true
           v8_symbol_level = 0
-          v8_target_cpu = "x64"
+          v8_target_cpu = "arm64"
         dest: /srv/source/chromium/src/out/Headless/args.gn
 
     - name: Generating Headless Chromium Configuration
@@ -320,9 +320,15 @@
         warn: false
       register: version
 
-    - name: Striping Symbols from Chromium Binary
+#    - name: Striping Symbols from Chromium Binary
+#      shell: |
+#        strip -o /srv/build/chromium/chromium-{{ version.stdout | quote }} out/Headless/headless_shell
+#      args:
+#        chdir: /srv/source/chromium/src
+
+    - name: Copy Chromium
       shell: |
-        strip -o /srv/build/chromium/chromium-{{ version.stdout | quote }} out/Headless/headless_shell
+        cp out/Headless/headless_shell /srv/build/chromium/chromium-{{ version.stdout | quote }}
       args:
         chdir: /srv/source/chromium/src