From 028425be9de58859d9b20915b86c818c09497e15 Mon Sep 17 00:00:00 2001
From: Rylie Pavlik <rylie.pavlik@collabora.com>
Date: Fri, 7 Jun 2024 13:47:30 -0500
Subject: [PATCH] android: Rename gradle projects.

Apparently in some contexts, only the last component of the name matters,
and it was the same for more than one module.

Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2243>
---
 settings.gradle                             | 8 ++++++--
 src/xrt/ipc/android/build.gradle            | 2 +-
 src/xrt/targets/android_common/build.gradle | 2 +-
 src/xrt/targets/openxr_android/build.gradle | 4 ++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/settings.gradle b/settings.gradle
index 9fb985179..35119ddbd 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -23,7 +23,11 @@ dependencyResolutionManagement {
 
 rootProject.name = 'monado'
 
-include ':src:xrt:auxiliary:android'
-include ':src:xrt:ipc:android'
+include ':src:xrt:auxiliary'
+project(':src:xrt:auxiliary').projectDir = new File(rootDir, 'src/xrt/auxiliary/android')
+
+include ':src:xrt:ipc'
+project(':src:xrt:ipc').projectDir = new File(rootDir, 'src/xrt/ipc/android')
+
 include ':src:xrt:targets:android_common'
 include ':src:xrt:targets:openxr_android'
diff --git a/src/xrt/ipc/android/build.gradle b/src/xrt/ipc/android/build.gradle
index 2c8114af7..d50c408f8 100644
--- a/src/xrt/ipc/android/build.gradle
+++ b/src/xrt/ipc/android/build.gradle
@@ -60,7 +60,7 @@ android {
 }
 
 dependencies {
-    implementation project(':src:xrt:auxiliary:android')
+    implementation project(':src:xrt:auxiliary')
     implementation "androidx.annotation:annotation:$androidxAnnotationVersion"
     implementation "androidx.core:core-ktx:$androidxCoreVersion"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
diff --git a/src/xrt/targets/android_common/build.gradle b/src/xrt/targets/android_common/build.gradle
index f405d1150..23ac9db4f 100644
--- a/src/xrt/targets/android_common/build.gradle
+++ b/src/xrt/targets/android_common/build.gradle
@@ -65,7 +65,7 @@ android {
 }
 
 dependencies {
-    implementation project(':src:xrt:auxiliary:android')
+    implementation project(':src:xrt:auxiliary')
     implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
     implementation "androidx.constraintlayout:constraintlayout:$androidxConstraintLayoutVersion"
diff --git a/src/xrt/targets/openxr_android/build.gradle b/src/xrt/targets/openxr_android/build.gradle
index 28ef18d64..6a715ff61 100644
--- a/src/xrt/targets/openxr_android/build.gradle
+++ b/src/xrt/targets/openxr_android/build.gradle
@@ -284,8 +284,8 @@ aboutLibraries {
 }
 
 dependencies {
-    outOfProcessImplementation project(':src:xrt:ipc:android')
-    implementation project(':src:xrt:auxiliary:android')
+    outOfProcessImplementation project(':src:xrt:ipc')
+    implementation project(':src:xrt:auxiliary')
     implementation project(':src:xrt:targets:android_common')
     implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"