From 5f8a15e9ae6091b7654156990bfc35b3d01f276d Mon Sep 17 00:00:00 2001
From: Sebastian Kaspari <s.kaspari@gmail.com>
Date: Wed, 13 Feb 2019 13:48:11 +0100
Subject: [PATCH] Introduce aarch64 flavor and publish nightly build.

---
 .taskcluster.yml                       |  1 +
 app/build.gradle                       | 10 +++++++++-
 buildSrc/src/main/java/Dependencies.kt |  1 +
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.taskcluster.yml b/.taskcluster.yml
index b7f10ba06..0f3b113b8 100644
--- a/.taskcluster.yml
+++ b/.taskcluster.yml
@@ -91,6 +91,7 @@ tasks:
                 --output /opt/fenix/app/build/outputs/apk \
                 --apk arm/release/app-arm-release-unsigned.apk \
                 --apk x86/release/app-x86-release-unsigned.apk \
+                --apk aarch64/release/app-aarch64-release-unsigned.apk
                 --date ${now}
           artifacts:
             public/task-graph.json:
diff --git a/app/build.gradle b/app/build.gradle
index 9df434e57..35ac3ea7c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -30,8 +30,8 @@ android {
     }
 
     flavorDimensions "abi"
+
     productFlavors {
-        // replace the libraries with 64-bit versions when they're ready
         // Processor architectures
         arm {
             dimension "abi"
@@ -45,6 +45,12 @@ android {
                 abiFilter "x86"
             }
         }
+        aarch64 {
+            dimension "abi"
+            ndk {
+                abiFilter "arm64-v8a"
+            }
+        }
     }
 
     compileOptions {
@@ -143,6 +149,8 @@ dependencies {
 
     armImplementation Deps.geckoview_nightly_arm
     x86Implementation Deps.geckoview_nightly_x86
+    aarch64Implementation Deps.geckoview_nightly_aarch64
+
     implementation Deps.androidx_legacy
     implementation Deps.androidx_preference
     implementation Deps.androidx_fragment
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index d23a02a11..fdcfc275a 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -45,6 +45,7 @@ object Deps {
 
     const val geckoview_nightly_arm = "org.mozilla.geckoview:geckoview-nightly-armeabi-v7a:${Versions.geckoNightly}"
     const val geckoview_nightly_x86 = "org.mozilla.geckoview:geckoview-nightly-x86:${Versions.geckoNightly}"
+    const val geckoview_nightly_aarch64 = "org.mozilla.geckoview:geckoview-nightly-arm64-v8a:${Versions.geckoNightly}"
 
     const val mozilla_concept_engine = "org.mozilla.components:concept-engine:${Versions.mozilla_android_components}"
     const val mozilla_concept_tabstray = "org.mozilla.components:concept-tabstray:${Versions.mozilla_android_components}"