Merge pull request #96254 from raulsntos/android/keyStore.isEmpty()

akien-mga · akien-mga · commit 526b35c92978 · 2024-08-29T10:36:49.000+02:00
[Android] Check if `keyStore` path is empty
diff --git a/platform/android/java/editor/build.gradle b/platform/android/java/editor/build.gradle
@@ -37,7 +37,7 @@ ext {
     // Return the keystore file used for signing the release build.
     getGodotKeystoreFile = { ->
         def keyStore = System.getenv("GODOT_ANDROID_SIGN_KEYSTORE")
-        if (keyStore == null) {
+        if (keyStore == null || keyStore.isEmpty()) {
             return null
         }
         return file(keyStore)

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ ext {`
`37`	`37`	`// Return the keystore file used for signing the release build.`
`38`	`38`	`getGodotKeystoreFile = { ->`
`39`	`39`	`def keyStore = System.getenv("GODOT_ANDROID_SIGN_KEYSTORE")`
`40`		`- if (keyStore == null) {`
	`40`	`+ if (keyStore == null \|\| keyStore.isEmpty()) {`
`41`	`41`	`return null`
`42`	`42`	`}`
`43`	`43`	`return file(keyStore)`