Adds versionNameSuffix to build type

Adds support for a versionNameSuffix attribute to the build type
which works like packageNameSuffix -- it is appended to the
version name as derived from the manifest and overridden by the
flavors.

Change-Id: Ib303f30d2253bbd2367664b826d8dc93f5f3731e

1 files changed, 3 insertions, 3 deletions

diff --git a/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy b/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy
index 0c9dd45..19cb3a3 100644
--- a/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy
+++ b/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy
@@ -249,15 +249,15 @@ public abstract class BasePlugin {
         processManifestTask.conventionMapping.manifestOverlays = {
             config.manifestOverlays
         }
+        processManifestTask.conventionMapping.versionName = {
+            config.versionName
+        }
         processManifestTask.conventionMapping.libraries = {
             getManifestDependencies(config.directLibraries)
         }
         processManifestTask.conventionMapping.versionCode = {
             mergedFlavor.versionCode
         }
-        processManifestTask.conventionMapping.versionName = {
-            mergedFlavor.versionName
-        }
         processManifestTask.conventionMapping.minSdkVersion = {
             mergedFlavor.minSdkVersion
         }