Add separate Oculus 6DOF build target (#1307)

MozillaReality · Jun 10, 2019 · d3621e2 · d3621e2
1 parent a4ba50a
commit d3621e2
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 1 deletion.
diff --git a/app/build.gradle b/app/build.gradle
@@ -126,7 +126,22 @@ android {
                     arguments "-DVR_SDK_LIB=oculusvr-lib", "-DOCULUSVR=ON"
                 }
             }
+            manifestPlaceholders = [ headtrackingRequired:"true" ]
         }
+
+        oculusvr3dof {
+            dimension "platform"
+            externalNativeBuild {
+                cmake {
+                    cppFlags " -I" + file("${project.rootDir}/third_party/ovr_mobile/VrApi/Include").absolutePath +
+                            " -I" + file("${project.rootDir}/app/src/oculusvr/cpp").absolutePath +
+                            " -DOCULUSVR"
+                    arguments "-DVR_SDK_LIB=oculusvr-lib", "-DOCULUSVR=ON"
+                }
+            }
+            manifestPlaceholders = [ headtrackingRequired:"false" ]
+        }
+
         svr {
             dimension "platform"
             externalNativeBuild {
@@ -190,6 +205,10 @@ android {
                 'oculusvrArmRelease',
                 'oculusvrArm64Debug',
                 'oculusvrArm64Release',
+                'oculusvr3dofArmDebug',
+                'oculusvr3dofArmRelease',
+                'oculusvr3dofArm64Debug',
+                'oculusvr3dofArm64Release',
                 'svrArmDebug',
                 'svrArmRelease',
                 'svrArm64Debug',
@@ -234,6 +253,15 @@ android {
             ]
         }
 
+        oculusvr3dof {
+            java.srcDirs = [
+                    'src/oculusvr/java'
+            ]
+            assets.srcDirs = [
+                    'src/oculusvr/assets'
+            ]
+        }
+
         oculusvrArmRelease {
             manifest.srcFile getUseDebugSigningOnRelease() ? "src/oculusvrArmDebug/AndroidManifest.xml"
                                                            :  manifest.srcFile
@@ -248,6 +276,24 @@ android {
                                                            : "src/oculusvrArmRelease/AndroidManifest.xml"
         }
 
+        oculusvr3dofArmDebug {
+            manifest.srcFile "src/oculusvrArmDebug/AndroidManifest.xml"
+        }
+
+        oculusvr3dofArm64Debug {
+            manifest.srcFile "src/oculusvrArmDebug/AndroidManifest.xml"
+        }
+
+        oculusvr3dofArmRelease {
+            manifest.srcFile getUseDebugSigningOnRelease() ? "src/oculusvrArmDebug/AndroidManifest.xml"
+                    : "src/oculusvrArmRelease/AndroidManifest.xml"
+        }
+
+        oculusvr3dofArm64Release {
+            manifest.srcFile getUseDebugSigningOnRelease() ? "src/oculusvrArmDebug/AndroidManifest.xml"
+                    : "src/oculusvrArmRelease/AndroidManifest.xml"
+        }
+
         svr {
             java.srcDirs = [
                     'src/svr/java'

diff --git a/app/src/oculusvrArmDebug/AndroidManifest.xml b/app/src/oculusvrArmDebug/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.mozilla.vrbrowser">
     <uses-feature android:glEsVersion="0x00030001"/>
-    <uses-feature android:name="android.hardware.vr.headtracking" android:version="1" android:required="true" />
+    <uses-feature android:name="android.hardware.vr.headtracking" android:version="1" android:required="${headtrackingRequired}" />
     <application>
         <meta-data android:name="com.samsung.android.vr.application.mode" android:value="vr_only"/>
         <activity android:name=".VRBrowserActivity" android:screenOrientation="landscape">

diff --git a/tools/taskcluster/build_targets.py b/tools/taskcluster/build_targets.py
@@ -34,6 +34,7 @@
 
 platforms = {
    'oculusvr': ['arm', 'arm64'],
+   'oculusvr3dof': ['arm', 'arm64'],
    'wavevr': ['arm'],
    'googlevr': ['arm', 'arm64'],
    'noapi': ['arm', 'arm64', 'x86'],