aboutsummaryrefslogtreecommitdiff
path: root/gradle/src
diff options
context:
space:
mode:
authorScott Barta <sbarta@google.com>2012-12-11 14:10:55 -0800
committerGerrit Code Review <noreply-gerritcodereview@google.com>2012-12-11 14:10:55 -0800
commit925238ba75354fa2ea2cea6f3cc612d10ee1b5f5 (patch)
treefca8504f49ebd8396a93ef0fb24bd3bb5943d689 /gradle/src
parentd276f419848b7e1376dadc13c2984081f2b4c804 (diff)
parentb9209e204fe89b73e12b3512ff5a45d7254a5135 (diff)
downloadbuild-925238ba75354fa2ea2cea6f3cc612d10ee1b5f5.tar.gz
Merge "Adds versionNameSuffix to build type"
Diffstat (limited to 'gradle/src')
-rw-r--r--gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy6
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 02d2120..697d19f 100644
--- a/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy
+++ b/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy
@@ -261,15 +261,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
}