Merge pull request #105671 from m4gr3d/switch_to_separate_debug_symbols

Use `separate_debug_symbols` to control generation of the separate Android debug symbols file

platform/android/detect.py

@@ -40,7 +40,6 @@ def get_opts():
             False,
         ),
         BoolVariable("swappy", "Use Swappy Frame Pacing library", False),
-        BoolVariable("gradle_do_not_strip", "Whether Gradle should strip the Android *.so libraries or not", False),
     ]
 
 

platform/android/platform_android_builders.py

@@ -22,7 +22,7 @@ def generate_android_binaries(target, source, env):
         gradle_process += ["generateGodotTemplates"]
     gradle_process += ["--quiet"]
 
-    if env["gradle_do_not_strip"]:
+    if env["debug_symbols"] and not env["separate_debug_symbols"]:
         gradle_process += ["-PdoNotStrip=true"]
 
     subprocess.run(