From 779542b9b3d9a1317875016f0dfe0e8fc02dc981 Mon Sep 17 00:00:00 2001
From: korejan <64199710+korejan@users.noreply.github.com>
Date: Tue, 1 Nov 2022 16:46:54 +0000
Subject: [PATCH]  Adds using/sending FB Facial & Eye tracking to VRCFT by
 @AeroScripts & @dfgHiatus

alxr-engine submodule update:
    * Adds support for using/sending FB Facial & Eye tracking to VRCFT by @AeroScripts & @dfgHiatus
    * Wrap code in preprocessor conditionals to be used only by supported builds/platforms.
     * Fix crashes when running on Quest 1/
* Enable AndroidManifest.xml entries for Facial/Eye tracking.
---
 .../alxr-android-client/quest/Cargo.toml      | 20 +++++++++----------
 .../alxr-engine-sys/cpp/ALVR-OpenXR-Engine    |  2 +-
 alvr/xtask/src/main.rs                        |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/alvr/openxr-client/alxr-android-client/quest/Cargo.toml b/alvr/openxr-client/alxr-android-client/quest/Cargo.toml
index c39127dc28..0ee8a2681e 100644
--- a/alvr/openxr-client/alxr-android-client/quest/Cargo.toml
+++ b/alvr/openxr-client/alxr-android-client/quest/Cargo.toml
@@ -177,14 +177,14 @@ name = "com.oculus.feature.PASSTHROUGH"
 required = true
 
 # <uses-feature android:name="oculus.software.eye_tracking" android:required="true" />
-# [[package.metadata.android.uses_feature]]
-# name = "oculus.software.eye_tracking"
-# required = true
+[[package.metadata.android.uses_feature]]
+name = "oculus.software.eye_tracking"
+required = true
 
 # <uses-feature android:name="oculus.software.face_tracking" android:required="true" />
-# [[package.metadata.android.uses_feature]]
-# name = "oculus.software.face_tracking"
-# required = true
+[[package.metadata.android.uses_feature]]
+name = "oculus.software.face_tracking"
+required = true
 
 # <uses-feature android:name="android.software.vr.mode" android:required="false"/>
 # <uses-feature android:name="android.hardware.vr.high_performance" android:required="false"/>
@@ -247,11 +247,11 @@ name = "com.oculus.permission.WIFI_LOCK"
 name = "com.oculus.permission.HAND_TRACKING"
 
 # <uses-permission android:name="com.oculus.permission.EYE_TRACKING" />
-# [[package.metadata.android.uses_permission]]
-# name = "com.oculus.permission.EYE_TRACKING"
+[[package.metadata.android.uses_permission]]
+name = "com.oculus.permission.EYE_TRACKING"
 # <uses-permission android:name="com.oculus.permission.FACE_TRACKING" />
-# [[package.metadata.android.uses_permission]]
-# name = "com.oculus.permission.FACE_TRACKING"
+[[package.metadata.android.uses_permission]]
+name = "com.oculus.permission.FACE_TRACKING"
 
 # [[package.metadata.android.uses_permission]]
 # name = "org.khronos.openxr.permission.OPENXR"
diff --git a/alvr/openxr-client/alxr-engine-sys/cpp/ALVR-OpenXR-Engine b/alvr/openxr-client/alxr-engine-sys/cpp/ALVR-OpenXR-Engine
index 108c7a6d2a..e5d44fb93b 160000
--- a/alvr/openxr-client/alxr-engine-sys/cpp/ALVR-OpenXR-Engine
+++ b/alvr/openxr-client/alxr-engine-sys/cpp/ALVR-OpenXR-Engine
@@ -1 +1 @@
-Subproject commit 108c7a6d2a6ceb6dab0298f5a68cb7f0310c52bf
+Subproject commit e5d44fb93b0e66854b97cfd9ce555e7a05ed5514
diff --git a/alvr/xtask/src/main.rs b/alvr/xtask/src/main.rs
index 036b10fc9d..8f9cf5d69b 100644
--- a/alvr/xtask/src/main.rs
+++ b/alvr/xtask/src/main.rs
@@ -441,7 +441,7 @@ impl AlxBuildFlags {
         let feature_map = vec![
             (enable_bundle_ffmpeg, "bundled-ffmpeg"),
             (!self.no_nvidia, "cuda-interop"),
-            (enable_oculus_ext, "oculus-ext-headers")
+            (enable_oculus_ext, "oculus-ext-headers"),
         ];
 
         let flag_map = vec![