Browse Source

Merge pull request #67576 from m4gr3d/delete_old_godot_lib_main

Delete Android godot-lib with the old naming scheme
Fredia Huya-Kouadio 2 years ago
parent
commit
27f69b6f8b
1 changed files with 9 additions and 3 deletions
  1. 9 3
      platform/android/java/build.gradle

+ 9 - 3
platform/android/java/build.gradle

@@ -276,6 +276,11 @@ task generateDevTemplate {
     finalizedBy 'zipCustomBuild'
 }
 
+task clean(type: Delete) {
+    dependsOn 'cleanGodotEditor'
+    dependsOn 'cleanGodotTemplates'
+}
+
 /**
  * Clean the generated editor artifacts.
  */
@@ -292,8 +297,6 @@ task cleanGodotEditor(type: Delete) {
     // Delete the Godot editor apks in the Godot bin directory
     delete("$binDir/android_editor.apk")
     delete("$binDir/android_editor_dev.apk")
-
-    finalizedBy getTasksByName("clean", true)
 }
 
 /**
@@ -321,5 +324,8 @@ task cleanGodotTemplates(type: Delete) {
     delete("$binDir/godot-lib.template_debug.dev.aar")
     delete("$binDir/godot-lib.template_release.aar")
 
-    finalizedBy getTasksByName("clean", true)
+    // Cover deletion for the libs using the previous naming scheme
+    delete("$binDir/godot-lib.debug.aar")
+    delete("$binDir/godot-lib.dev.aar")
+    delete("$binDir/godot-lib.release.aar")
 }