godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable Android studio debugger.

This commit is contained in:
fhuya 2020-03-08 12:34:44 +01:00
parent 78adce833b
commit 41dadb2b2b
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
platform/android/java/app/build.gradle
View File

@ -71,6 +71,7 @@ android {
packagingOptions { packagingOptions {
exclude 'META-INF/LICENSE' exclude 'META-INF/LICENSE'
exclude 'META-INF/NOTICE' exclude 'META-INF/NOTICE'
doNotStrip '**/*.so'
} }
// Both signing and zip-aligning will be done at export time // Both signing and zip-aligning will be done at export time

6
platform/android/java/build.gradle
View File

@ -25,7 +25,7 @@ ext {
sconsExt = org.gradle.internal.os.OperatingSystem.current().isWindows() ? ".bat" : "" sconsExt = org.gradle.internal.os.OperatingSystem.current().isWindows() ? ".bat" : ""
supportedAbis = ["armv7", "arm64v8", "x86", "x86_64"] 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`. // Used by gradle to specify which architecture to build for by default when running `./gradlew build`.
// This command is usually used by Android Studio. // This command is usually used by Android Studio.
@ -136,14 +136,14 @@ task zipCustomBuild(type: Zip) {
*/ */
task generateGodotTemplates(type: GradleBuild) { task generateGodotTemplates(type: GradleBuild) {
// We exclude these gradle tasks so we can run the scons command manually. // 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) startParameter.excludedTaskNames += ":lib:" + getSconsTaskName(buildType)
} }
tasks = ["copyGodotPaymentPluginToAppModule"] tasks = ["copyGodotPaymentPluginToAppModule"]
// Only build the apks and aar files for which we have native shared libraries. // 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) File targetLibs = new File("lib/libs/" + target)
if (targetLibs != null if (targetLibs != null
&& targetLibs.isDirectory() && targetLibs.isDirectory()

3
platform/android/java/lib/build.gradle
View File

@ -26,6 +26,7 @@ android {
packagingOptions { packagingOptions {
exclude 'META-INF/LICENSE' exclude 'META-INF/LICENSE'
exclude 'META-INF/NOTICE' exclude 'META-INF/NOTICE'
doNotStrip '**/*.so'
} }
sourceSets { sourceSets {
@ -56,7 +57,7 @@ android {
// files is only setup for editing support. // files is only setup for editing support.
gradle.startParameter.excludedTaskNames += taskPrefix + "externalNativeBuild" + buildType gradle.startParameter.excludedTaskNames += taskPrefix + "externalNativeBuild" + buildType
def releaseTarget = supportedTargets[buildType.toLowerCase()] def releaseTarget = buildType.toLowerCase()
if (releaseTarget == null || releaseTarget == "") { if (releaseTarget == null || releaseTarget == "") {
throw new GradleException("Invalid build type: " + buildType) throw new GradleException("Invalid build type: " + buildType)
} }