[Android] Specific apk name for non-vanilla builds

[Geoffrey Métais]

vlc-ports/android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Fri Feb 27 10:54:23 2015 +0100| [bddd2ca232d542b53bf143bd14a653c35c8d628e] | committer: Geoffrey Métais

Specific apk name for non-vanilla builds

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

 vlc-android/build.gradle |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vlc-android/build.gradle b/vlc-android/build.gradle
index 1c3373e..87fc59d 100644
--- a/vlc-android/build.gradle
+++ b/vlc-android/build.gradle
@@ -145,7 +145,10 @@ android {
 
         //Custom APK name
         variant.outputs.each { output ->
-            def outputName = "VLC-"+vlcVersion+"-"+variant.productFlavors.get(1).name+".apk"
+            def outputName = "VLC-Android-"
+            if (!variant.productFlavors.get(0).name.equals("vanilla"))
+                outputName += variant.productFlavors.get(0).name.toUpperCase()+"-"
+            outputName += vlcVersion+"-"+variant.productFlavors.get(1).name+".apk"
             output.outputFile = new File(output.outputFile.parentFile, outputName);
         }
     }