OpenXR - Use a build variant instead of a module

android/QuestManifest.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools">
+
+    <uses-feature android:name="android.hardware.vr.headtracking" android:version="1" android:required="true" />
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name" 
+        android:logo="@drawable/ic_banner"
+        android:isGame="true"
+        android:banner="@drawable/tv_banner"
+        android:requestLegacyExternalStorage="true"
+        android:preserveLegacyExternalStorage="true">
+
+        <meta-data android:name="com.samsung.android.vr.application.mode" android:value="vr_only"/>
+        <meta-data android:name="com.oculus.supportedDevices" android:value="quest|quest2"/>
+    </application>
+</manifest>

android/build.gradle

@@ -65,9 +65,6 @@ android {
 			versionCode ANDROID_VERSION_CODE
 			versionName ANDROID_VERSION_NAME
 		}
-		ndk {
-			abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
-		}
 		signingConfig signingConfigs.debug
 	}
 	buildTypes {
@@ -106,6 +103,9 @@ android {
 		gold {
 			res.srcDirs = ['gold/res']
 		}
+		quest {
+			manifest.srcFile 'QuestManifest.xml'
+		}
 	}
 	productFlavors {
 		normal {
@@ -122,6 +122,9 @@ android {
 							'-DANDROID_ARM_NEON=TRUE'
 				}
 			}
+			ndk {
+				abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
+			}
 		}
 		gold {
 			applicationId 'org.ppsspp.ppssppgold'
@@ -138,14 +141,39 @@ android {
 							'-DGOLD=TRUE'
 				}
 			}
+			ndk {
+				abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
+			}
+		}
+		quest {
+			applicationId 'org.ppsspp.ppsspp'
+			dimension "variant"
+			externalNativeBuild {
+				cmake {
+					// Available arguments listed at https://developer.android.com/ndk/guides/cmake.html
+					arguments '-DANDROID=true',
+							'-DANDROID_PLATFORM=android-16',
+							'-DANDROID_TOOLCHAIN=clang',
+							'-DANDROID_CPP_FEATURES=',
+							'-DANDROID_STL=c++_static',
+							'-DANDROID_ARM_NEON=TRUE',
+							'-DOPENXR=TRUE'
+				}
+			}
+			ndk {
+				abiFilters 'arm64-v8a'
+			}
 		}
 	}
 	variantFilter { variant ->
 		def needed = variant.name in [
 			'normalDebug',		// for debugging
 			'normalOptimized',	// for testing
 			'normalRelease',	// for Google Play releases
-			'goldRelease'		// for Google Play releases
+			'goldRelease',		// for Google Play releases
+			'questDebug',		// for VR debugging
+			'questOptimized',	// for VR testing
+			'questRelease',		// for VR releases
 		]
 		variant.setIgnore(!needed)
 	}