[Android] Do not sign CLI release builds

[Geoffrey Métais]

vlc-android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Fri Mar 17 11:23:34 2017 +0100| [b52b3351c9ce348280c860d01d5dc28fdd1af2c1] | committer: Geoffrey Métais

Do not sign CLI release builds

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

 compile.sh               |  2 +-
 vlc-android/build.gradle | 13 ++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/compile.sh b/compile.sh
index c12fae7..303f340 100755
--- a/compile.sh
+++ b/compile.sh
@@ -229,7 +229,7 @@ else
         ACTION="assemble"
     fi
     TARGET="${ACTION}${PLATFORM}${GRADLE_ABI}${BUILDTYPE}"
-    PASSWORD_KEYSTORE="$PASSWORD_KEYSTORE" ./gradlew $TARGET
+    CLI="" ./gradlew $TARGET
 fi
 
 #######
diff --git a/vlc-android/build.gradle b/vlc-android/build.gradle
index dac4ff9..6b0b85e 100644
--- a/vlc-android/build.gradle
+++ b/vlc-android/build.gradle
@@ -61,7 +61,7 @@ android {
         }
 
         //Set the build ABI according to build types only if not launched from compile.sh
-        if (System.getenv('PASSWORD_KEYSTORE') == null)
+        if (System.getenv('CLI') == null)
             tasks.whenTaskAdded { task ->
                 if (task.name.startsWith('assemble')) {
                     if (task.name.endsWith('ARMv7Debug'))
@@ -92,19 +92,14 @@ 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
-            }
+            storePassword storepwd
+            keyPassword storepwd
         }
     }
 
     buildTypes {
         release {
-            signingConfig signingConfigs.release
+            signingConfig System.getenv('CLI') != null ? null : signingConfigs.release
             minifyEnabled true
             shrinkResources false
             proguardFile 'proguard.cfg'