[Android] App version + VLC version in libvlc aar name

[Geoffrey Métais]

vlc-android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Wed Mar 30 18:27:45 2016 +0200| [57914404584e1c42b78ae6130381330b00b1480e] | committer: Geoffrey Métais

App version + VLC version in libvlc aar name

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

 libvlc/build.gradle | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libvlc/build.gradle b/libvlc/build.gradle
index 1c00260..881af94 100644
--- a/libvlc/build.gradle
+++ b/libvlc/build.gradle
@@ -35,11 +35,13 @@ android {
         def manifestParser = new com.android.builder.core.DefaultManifestParser()
         // get the version code of each flavor
         def vlcVersion = manifestParser.getVersionName(android.sourceSets.main.manifest.srcFile)
+        manifestParser = new com.android.builder.core.DefaultManifestParser()
+        def androidVersion = manifestParser.getVersionName(file('../vlc-android/AndroidManifest.xml'))
         //Custom APK name
         variant.outputs.each { output ->
             def outputFile = output.outputFile
             if (outputFile != null && outputFile.name.endsWith('.aar')) {
-                def fileName = "libvlc-${vlcVersion}.aar"
+                def fileName = "libvlc-${vlcVersion}-${androidVersion}.aar"
                 output.outputFile = new File(outputFile.parent, fileName)
             }
         }