Skip to content

Commit

Permalink
[Android] Allow to build dev template with symbols
Browse files Browse the repository at this point in the history
(cherry picked from commit fd7141f)
  • Loading branch information
thebestnom authored and akien-mga committed Apr 30, 2021
1 parent 08bedba commit 31bc9d8
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 8 deletions.
2 changes: 1 addition & 1 deletion platform/android/java/app/config.gradle
Expand Up @@ -239,5 +239,5 @@ ext.shouldSign = { ->
}

ext.shouldNotStrip = { ->
return isAndroidStudio()
return isAndroidStudio() || project.hasProperty("doNotStrip")
}
36 changes: 30 additions & 6 deletions platform/android/java/build.gradle
Expand Up @@ -122,16 +122,17 @@ task zipCustomBuild(type: Zip) {
destinationDir(file(binDir))
}

/**
* Master task used to coordinate the tasks defined above to generate the set of Godot templates.
*/
task generateGodotTemplates(type: GradleBuild) {
def templateExcludedBuildTask() {
// We exclude these gradle tasks so we can run the scons command manually.
def excludedTasks = []
for (String buildType : supportedTargets) {
startParameter.excludedTaskNames += ":lib:" + getSconsTaskName(buildType)
excludedTasks += ":lib:" + getSconsTaskName(buildType)
}
return excludedTasks
}

tasks = []
def templateBuildTasks() {
def tasks = []

// Only build the apks and aar files for which we have native shared libraries.
for (String target : supportedTargets) {
Expand All @@ -152,6 +153,29 @@ task generateGodotTemplates(type: GradleBuild) {
}
}

return tasks
}

/**
* Master task used to coordinate the tasks defined above to generate the set of Godot templates.
*/
task generateGodotTemplates(type: GradleBuild) {
startParameter.excludedTaskNames = templateExcludedBuildTask()
tasks = templateBuildTasks()

finalizedBy 'zipCustomBuild'
}

/**
* Generates the same output as generateGodotTemplates but with dev symbols
*/
task generateDevTemplate (type: GradleBuild) {
// add parameter to set symbols to true
startParameter.projectProperties += [doNotStrip: true]

startParameter.excludedTaskNames = templateExcludedBuildTask()
tasks = templateBuildTasks()

finalizedBy 'zipCustomBuild'
}

Expand Down
2 changes: 1 addition & 1 deletion platform/android/java/gradle.properties
Expand Up @@ -12,7 +12,7 @@ android.useAndroidX=true

# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx1536m
org.gradle.jvmargs=-Xmx4536m

# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
Expand Down

0 comments on commit 31bc9d8

Please sign in to comment.