Add support for arm64-v8a on GVR, Oculus and SVR (#949)

MozillaReality · Feb 14, 2019 · 233901d · 233901d
1 parent 0005880
commit 233901d
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 1 deletion.
diff --git a/app/build.gradle b/app/build.gradle
@@ -164,6 +164,13 @@ android {
             }
         }
 
+        arm64 {
+            dimension "abi"
+            ndk {
+                abiFilters "arm64-v8a"
+            }
+        }
+
         x86 {
             dimension "abi"
             ndk {
@@ -176,14 +183,22 @@ android {
         def needed = variant.name in [
                 'googlevrArmDebug',
                 'googlevrArmRelease',
+                'googlevrArm64Debug',
+                'googlevrArm64Release',
                 'oculusvrArmDebug',
                 'oculusvrArmRelease',
+                'oculusvrArm64Debug',
+                'oculusvrArm64Release',
                 'svrArmDebug',
                 'svrArmRelease',
+                'svrArm64Debug',
+                'svrArm64Release',
                 'wavevrArmDebug',
                 'wavevrArmRelease',
                 'noapiArmDebug',
                 'noapiArmRelease',
+                'noapiArm64Debug',
+                'noapiArm64Release',
                 'noapiX86Debug',
                 'noapiX86Release'
         ]
@@ -223,6 +238,15 @@ android {
                                                            :  manifest.srcFile
         }
 
+        oculusvrArm64Debug {
+            manifest.srcFile "src/oculusvrArmDebug/AndroidManifest.xml"
+        }
+
+        oculusvrArm64Release {
+            manifest.srcFile getUseDebugSigningOnRelease() ? "src/oculusvrArmDebug/AndroidManifest.xml"
+                                                           : "src/oculusvrArmRelease/AndroidManifest.xml"
+        }
+
         svr {
             java.srcDirs = [
                     'src/svr/java'
@@ -309,6 +333,7 @@ if (findProject(':geckoview-local')) {
         // To see what the latest geckoview-nightly version is go here:
         // https://maven.mozilla.org/?prefix=maven2/org/mozilla/geckoview/geckoview-nightly-armeabi-v7a/
         armImplementation deps.gecko_view.nightly_armv7a
+        arm64Implementation deps.gecko_view.nightly_arm64
         x86Implementation deps.gecko_view.nightly_x86
     }
 }

diff --git a/app/src/main/cpp/vrb b/app/src/main/cpp/vrb
diff --git a/versions.gradle b/versions.gradle
@@ -42,6 +42,7 @@ def deps = [:]
 
 def gecko_view = [:]
 gecko_view.nightly_armv7a = "org.mozilla.geckoview:geckoview-nightly-armeabi-v7a:$versions.gecko_view"
+gecko_view.nightly_arm64 = "org.mozilla.geckoview:geckoview-nightly-arm64-v8a:$versions.gecko_view"
 gecko_view.nightly_x86 = "org.mozilla.geckoview:geckoview-nightly-x86:$versions.gecko_view"
 deps.gecko_view = gecko_view