From ca77240f3630ccce043022c45a6b28d1c4938897 Mon Sep 17 00:00:00 2001
From: Lubos <tridosm@gmail.com>
Date: Sat, 24 Sep 2022 21:16:57 +0200
Subject: [PATCH] OpenXR - Rename Quest build variant

---
 android/build.gradle                              | 10 +++++-----
 android/src/org/ppsspp/ppsspp/NativeActivity.java |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index 14b7d5da92..cdb28b5d50 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -103,7 +103,7 @@ android {
 		gold {
 			res.srcDirs = ['gold/res']
 		}
-		quest {
+		vr_quest {
 			manifest.srcFile 'QuestManifest.xml'
 		}
 	}
@@ -145,7 +145,7 @@ android {
 				abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
 			}
 		}
-		quest {
+		vr_quest {
 			applicationId 'org.ppsspp.ppsspp'
 			dimension "variant"
 			externalNativeBuild {
@@ -171,9 +171,9 @@ android {
 			'normalOptimized',	// for testing
 			'normalRelease',	// for Google Play releases
 			'goldRelease',		// for Google Play releases
-			'questDebug',		// for VR debugging
-			'questOptimized',	// for VR testing
-			'questRelease',		// for VR releases
+			'vr_questDebug',    // for VR debugging on Quest
+			'vr_questOptimized',// for VR testing on Quest
+			'vr_questRelease',  // for VR releases on Quest
 		]
 		variant.setIgnore(!needed)
 	}
diff --git a/android/src/org/ppsspp/ppsspp/NativeActivity.java b/android/src/org/ppsspp/ppsspp/NativeActivity.java
index 758d7eb6a8..625546b470 100644
--- a/android/src/org/ppsspp/ppsspp/NativeActivity.java
+++ b/android/src/org/ppsspp/ppsspp/NativeActivity.java
@@ -1547,6 +1547,6 @@ public abstract class NativeActivity extends Activity {
 	}
 
 	private boolean isVRDevice() {
-		return BuildConfig.FLAVOR.compareTo("quest") == 0;
+		return BuildConfig.FLAVOR.startsWith("vr_") == 0;
 	}
 }