Respect XDG_CONFIG_HOME environment variable

Author: mhsmith

.github/workflows/build.yml

@@ -350,13 +350,16 @@ jobs:
 
     runs-on: ${{ matrix.runs-on }}
     steps:
-      - uses: mxschmitt/action-tmate@v3  # FIXME
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
       - name: Build and test
         run: ./Android/android.py ci --fast-ci ${{ matrix.arch }}-linux-android
 
+      # FIXME
+      - if: ${{ failure() }}
+        uses: mxschmitt/action-tmate@v3
+
   build-ios:
     name: iOS
     needs: build-context

Android/testbed/app/build.gradle.kts

@@ -243,9 +243,11 @@ abstract class CreateEmulatorTask : DefaultTask() {
     }
 
     private val avdDir by lazy {
-        val userHome =
-            System.getenv("ANDROID_USER_HOME") ?:
-            (System.getProperty("user.home")!! + "/.android")
+        // XDG_CONFIG_HOME is respected by both avdmanager and Gradle.
+        val userHome = System.getenv("ANDROID_USER_HOME") ?: (
+            (System.getenv("XDG_CONFIG_HOME") ?: System.getProperty("user.home")!!)
+            + "/.android"
+        )
         File("$userHome/avd/gradle-managed", "$avdName.avd")
     }
 
@@ -278,10 +280,6 @@ abstract class CreateEmulatorTask : DefaultTask() {
         if (!File(avdDir.parentFile.parentFile, iniName).renameTo(
             File(avdDir.parentFile, iniName)
         )) {
-            // FIXME
-            execOps.exec {
-                commandLine("ls", "-lR", avdDir.parentFile.parentFile)
-            }
             throw GradleException("Failed to rename $iniName")
         }
     }