From cd2b2bf8bf0533747aeb7200fc1353e7d67c76a5 Mon Sep 17 00:00:00 2001
From: fhuya <fhuya@google.com>
Date: Sun, 8 Mar 2020 12:34:44 +0100
Subject: [PATCH] Enable Android studio debugger.

(cherry picked from commit 41dadb2b2b7f6a579e4ac815d6f8e4db88b234f3)
---
 platform/android/java/app/build.gradle | 1 +
 platform/android/java/build.gradle     | 6 +++---
 platform/android/java/lib/build.gradle | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/platform/android/java/app/build.gradle b/platform/android/java/app/build.gradle
index e706426f7fa..e67d137ce5a 100644
--- a/platform/android/java/app/build.gradle
+++ b/platform/android/java/app/build.gradle
@@ -83,6 +83,7 @@ android {
     packagingOptions {
         exclude 'META-INF/LICENSE'
         exclude 'META-INF/NOTICE'
+        doNotStrip '**/*.so'
     }
 
     // Both signing and zip-aligning will be done at export time
diff --git a/platform/android/java/build.gradle b/platform/android/java/build.gradle
index feb44661bbd..6ff6376154d 100644
--- a/platform/android/java/build.gradle
+++ b/platform/android/java/build.gradle
@@ -24,7 +24,7 @@ ext {
     sconsExt = org.gradle.internal.os.OperatingSystem.current().isWindows() ? ".bat" : ""
 
     supportedAbis = ["armv7", "arm64v8", "x86", "x86_64"]
-    supportedTargets = ['release': "release", 'debug': "release_debug"]
+    supportedTargets = ["release", "debug"]
 
     // Used by gradle to specify which architecture to build for by default when running `./gradlew build`.
     // This command is usually used by Android Studio.
@@ -135,14 +135,14 @@ task zipCustomBuild(type: Zip) {
  */
 task generateGodotTemplates(type: GradleBuild) {
     // We exclude these gradle tasks so we can run the scons command manually.
-    for (String buildType : supportedTargets.keySet()) {
+    for (String buildType : supportedTargets) {
         startParameter.excludedTaskNames += ":lib:" + getSconsTaskName(buildType)
     }
 
     tasks = ["copyGodotPaymentPluginToAppModule"]
 
     // Only build the apks and aar files for which we have native shared libraries.
-    for (String target : supportedTargets.keySet()) {
+    for (String target : supportedTargets) {
         File targetLibs = new File("lib/libs/" + target)
         if (targetLibs != null
             && targetLibs.isDirectory()
diff --git a/platform/android/java/lib/build.gradle b/platform/android/java/lib/build.gradle
index bef66e2e6ba..0d1cc32d3af 100644
--- a/platform/android/java/lib/build.gradle
+++ b/platform/android/java/lib/build.gradle
@@ -25,6 +25,7 @@ android {
     packagingOptions {
         exclude 'META-INF/LICENSE'
         exclude 'META-INF/NOTICE'
+        doNotStrip '**/*.so'
     }
 
     sourceSets {
@@ -55,7 +56,7 @@ android {
         // files is only setup for editing support.
         gradle.startParameter.excludedTaskNames += taskPrefix + "externalNativeBuild" + buildType
 
-        def releaseTarget = supportedTargets[buildType.toLowerCase()]
+        def releaseTarget = buildType.toLowerCase()
         if (releaseTarget == null || releaseTarget == "") {
             throw new GradleException("Invalid build type: " + buildType)
         }