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

Commit d3621e2

Browse files
MortimerGorobluemarvin
authored andcommitted
Add separate Oculus 6DOF build target (#1307)
1 parent a4ba50a commit d3621e2

File tree

3 files changed

+48
-1
lines changed

3 files changed

+48
-1
lines changed

app/build.gradle

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,22 @@ android {
126126
arguments "-DVR_SDK_LIB=oculusvr-lib", "-DOCULUSVR=ON"
127127
}
128128
}
129+
manifestPlaceholders = [ headtrackingRequired:"true" ]
129130
}
131+
132+
oculusvr3dof {
133+
dimension "platform"
134+
externalNativeBuild {
135+
cmake {
136+
cppFlags " -I" + file("${project.rootDir}/third_party/ovr_mobile/VrApi/Include").absolutePath +
137+
" -I" + file("${project.rootDir}/app/src/oculusvr/cpp").absolutePath +
138+
" -DOCULUSVR"
139+
arguments "-DVR_SDK_LIB=oculusvr-lib", "-DOCULUSVR=ON"
140+
}
141+
}
142+
manifestPlaceholders = [ headtrackingRequired:"false" ]
143+
}
144+
130145
svr {
131146
dimension "platform"
132147
externalNativeBuild {
@@ -190,6 +205,10 @@ android {
190205
'oculusvrArmRelease',
191206
'oculusvrArm64Debug',
192207
'oculusvrArm64Release',
208+
'oculusvr3dofArmDebug',
209+
'oculusvr3dofArmRelease',
210+
'oculusvr3dofArm64Debug',
211+
'oculusvr3dofArm64Release',
193212
'svrArmDebug',
194213
'svrArmRelease',
195214
'svrArm64Debug',
@@ -234,6 +253,15 @@ android {
234253
]
235254
}
236255

256+
oculusvr3dof {
257+
java.srcDirs = [
258+
'src/oculusvr/java'
259+
]
260+
assets.srcDirs = [
261+
'src/oculusvr/assets'
262+
]
263+
}
264+
237265
oculusvrArmRelease {
238266
manifest.srcFile getUseDebugSigningOnRelease() ? "src/oculusvrArmDebug/AndroidManifest.xml"
239267
: manifest.srcFile
@@ -248,6 +276,24 @@ android {
248276
: "src/oculusvrArmRelease/AndroidManifest.xml"
249277
}
250278

279+
oculusvr3dofArmDebug {
280+
manifest.srcFile "src/oculusvrArmDebug/AndroidManifest.xml"
281+
}
282+
283+
oculusvr3dofArm64Debug {
284+
manifest.srcFile "src/oculusvrArmDebug/AndroidManifest.xml"
285+
}
286+
287+
oculusvr3dofArmRelease {
288+
manifest.srcFile getUseDebugSigningOnRelease() ? "src/oculusvrArmDebug/AndroidManifest.xml"
289+
: "src/oculusvrArmRelease/AndroidManifest.xml"
290+
}
291+
292+
oculusvr3dofArm64Release {
293+
manifest.srcFile getUseDebugSigningOnRelease() ? "src/oculusvrArmDebug/AndroidManifest.xml"
294+
: "src/oculusvrArmRelease/AndroidManifest.xml"
295+
}
296+
251297
svr {
252298
java.srcDirs = [
253299
'src/svr/java'

app/src/oculusvrArmDebug/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.mozilla.vrbrowser">
33
<uses-feature android:glEsVersion="0x00030001"/>
4-
<uses-feature android:name="android.hardware.vr.headtracking" android:version="1" android:required="true" />
4+
<uses-feature android:name="android.hardware.vr.headtracking" android:version="1" android:required="${headtrackingRequired}" />
55
<application>
66
<meta-data android:name="com.samsung.android.vr.application.mode" android:value="vr_only"/>
77
<activity android:name=".VRBrowserActivity" android:screenOrientation="landscape">

tools/taskcluster/build_targets.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434

3535
platforms = {
3636
'oculusvr': ['arm', 'arm64'],
37+
'oculusvr3dof': ['arm', 'arm64'],
3738
'wavevr': ['arm'],
3839
'googlevr': ['arm', 'arm64'],
3940
'noapi': ['arm', 'arm64', 'x86'],

0 commit comments

Comments
 (0)