Skip to content
This repository has been archived by the owner on Jul 22, 2024. It is now read-only.

Add support for arm64-v8a on GoogleVR, Oculus and SVR #949

Merged
merged 1 commit into from
Feb 14, 2019
Merged

Add support for arm64-v8a on GoogleVR, Oculus and SVR #949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,13 @@ android {
}
}

arm64 {
dimension "abi"
ndk {
abiFilters "arm64-v8a"
}
}

x86 {
dimension "abi"
ndk {
Expand All @@ -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',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add noapiArm64[Debug,Release] also?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

'noapiArmRelease',
'noapiArm64Debug',
'noapiArm64Release',
'noapiX86Debug',
'noapiX86Release'
]
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/cpp/vrb
Open in desktop
Submodule vrb updated 1 files
+2 −2 src/Geometry.cpp
1 change: 1 addition & 0 deletions versions.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down