[Android] Build only if not launched from compile.sh

[Geoffrey Métais]

vlc-ports/android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Tue Feb 10 15:14:17 2015 +0100| [fe1e0cad757b548c96f43fc61da2ed102090fc80] | committer: Geoffrey Métais

Build only if not launched from compile.sh

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=fe1e0cad757b548c96f43fc61da2ed102090fc80
---

 vlc-android/build.gradle |   47 +++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/vlc-android/build.gradle b/vlc-android/build.gradle
index ceb4c3e..02234f4 100644
--- a/vlc-android/build.gradle
+++ b/vlc-android/build.gradle
@@ -20,29 +20,30 @@ android {
         resValue "string", "build_host", hostName()
         resValue "string", "build_revision", revision()
 
-        //Set the build ABI according to build types
-        tasks.whenTaskAdded { task ->
-            if (task.name.startsWith('assemble')) {
-                if (task.name.endsWith('ARMv5Debug'))
-                    task.dependsOn(":libvlc:buildDebugARMv5")
-                else if (task.name.endsWith('ARMv6fpuDebug'))
-                    task.dependsOn(":libvlc:buildDebugARMv6")
-                else if (task.name.endsWith('ARMv6nofpuDebug'))
-                    task.dependsOn(":libvlc:buildDebugARMv6_nofpu")
-                else if (task.name.endsWith('ARMv7Debug'))
-                    task.dependsOn(":libvlc:buildDebugARMv7")
-                else if (task.name.endsWith('ARMv8Debug'))
-                    task.dependsOn(":libvlc:buildDebugARM64")
-                else if (task.name.endsWith('X86Debug'))
-                    task.dependsOn(":libvlc:buildDebugx86")
-                else if (task.name.endsWith('X86_64Debug'))
-                    task.dependsOn(":libvlc:buildDebugx86_64")
-                else if (task.name.endsWith('MIPSDebug'))
-                    task.dependsOn(":libvlc:buildDebugMIPS")
-                else if (task.name.endsWith('MIPS64Debug'))
-                    task.dependsOn(":libvlc:buildDebugMIPS64")
+        //Set the build ABI according to build types only if not launched from compile.sh
+        if (System.getenv('PASSWORD_KEYSTORE') == null)
+            tasks.whenTaskAdded { task ->
+                if (task.name.startsWith('assemble')) {
+                    if (task.name.endsWith('ARMv5Debug'))
+                        task.dependsOn(":libvlc:buildDebugARMv5")
+                    else if (task.name.endsWith('ARMv6fpuDebug'))
+                        task.dependsOn(":libvlc:buildDebugARMv6")
+                    else if (task.name.endsWith('ARMv6nofpuDebug'))
+                        task.dependsOn(":libvlc:buildDebugARMv6_nofpu")
+                    else if (task.name.endsWith('ARMv7Debug'))
+                        task.dependsOn(":libvlc:buildDebugARMv7")
+                    else if (task.name.endsWith('ARMv8Debug'))
+                        task.dependsOn(":libvlc:buildDebugARM64")
+                    else if (task.name.endsWith('X86Debug'))
+                        task.dependsOn(":libvlc:buildDebugx86")
+                    else if (task.name.endsWith('X86_64Debug'))
+                        task.dependsOn(":libvlc:buildDebugx86_64")
+                    else if (task.name.endsWith('MIPSDebug'))
+                        task.dependsOn(":libvlc:buildDebugMIPS")
+                    else if (task.name.endsWith('MIPS64Debug'))
+                        task.dependsOn(":libvlc:buildDebugMIPS64")
+                }
             }
-        }
     }
 
     signingConfigs {
@@ -57,7 +58,7 @@ android {
              */
             storeFile file(keyStoreFile)
             keyAlias storealias
-            if (System.getenv('PASSWORD_KEYSTORE') != null){
+            if (System.getenv('PASSWORD_KEYSTORE') != null && !System.getenv('PASSWORD_KEYSTORE').isEmpty()){
                 storePassword = System.getenv('PASSWORD_KEYSTORE')
                 keyPassword = System.getenv('PASSWORD_KEYSTORE')
             } else {