diff --git a/gradle.properties b/gradle.properties
index 0c70289c7..082586396 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,4 +4,4 @@
 android.nonFinalResIds=false
 android.nonTransitiveRClass=false
 android.useAndroidX = true
-
+org.gradle.jvmargs=-Xmx2048m
diff --git a/src/xrt/targets/openxr_android/build.gradle b/src/xrt/targets/openxr_android/build.gradle
index 5cedbc7c8..e040df1ff 100644
--- a/src/xrt/targets/openxr_android/build.gradle
+++ b/src/xrt/targets/openxr_android/build.gradle
@@ -201,6 +201,11 @@ android {
             // Gradle plugin produces proguard-android-optimize.txt from @Keep annotations
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
+        debug {
+            minifyEnabled false
+            debuggable true
+            jniDebuggable true
+        }
     }
 
     externalNativeBuild {
@@ -255,6 +260,12 @@ android {
     }
 }
 
+androidComponents {
+    onVariants(selector().withBuildType("debug")) {
+        packaging.jniLibs.keepDebugSymbols.add("**")
+    }
+}
+
 aboutLibraries {
     // Full license text for license IDs mentioned here
     // will be included, even if no detected dependency uses them.