[Android] Do not require debug key in gradle.properties

[Geoffrey Métais]

vlc-android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Mon Dec 10 15:12:43 2018 +0100| [131c6abc7833553dcab8fc59e622f0b74ff60b61] | committer: Geoffrey Métais

Do not require debug key in gradle.properties

> https://code.videolan.org/videolan/vlc-android/commit/131c6abc7833553dcab8fc59e622f0b74ff60b61
---

 vlc-android/build.gradle | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/vlc-android/build.gradle b/vlc-android/build.gradle
index 563e449a3..95c9ceb33 100644
--- a/vlc-android/build.gradle
+++ b/vlc-android/build.gradle
@@ -94,14 +94,16 @@ android {
             storealias=androiddebugkey
             storepwd=android
              */
-            storeFile file(keyStoreFile)
-            keyAlias storealias
-            if (System.getenv('PASSWORD_KEYSTORE') != null && !System.getenv('PASSWORD_KEYSTORE').isEmpty()){
-                storePassword = System.getenv('PASSWORD_KEYSTORE')
-                keyPassword = System.getenv('PASSWORD_KEYSTORE')
-            } else {
-                storePassword storepwd
-                keyPassword storepwd
+            if (project.hasProperty('keyStoreFile')) {
+                storeFile file(project.findProperty('keyStoreFile'))
+                keyAlias project.findProperty('storealias')
+                if (System.getenv('PASSWORD_KEYSTORE') != null && !System.getenv('PASSWORD_KEYSTORE').isEmpty()){
+                    storePassword = System.getenv('PASSWORD_KEYSTORE')
+                    keyPassword = System.getenv('PASSWORD_KEYSTORE')
+                } else {
+                    storePassword project.findProperty('storepwd')
+                    keyPassword project.findProperty('storepwd')
+                }
             }
         }
     }