commit f4ce6b8949ecb7e2c62900905b9f3eff559313af
author Jean-Philippe Lesot <jplesot@google.com> Fri Feb 06 08:49:26 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 06 08:49:27 2015 +0000
tree 19f29e40b88c0c4c3822a9791763ef9b6335e742
parent 43d41eae795078ad6f016928279ea8311f9913c3
parent ab3795b3ca10d47a27f35346334c5a9c8ba43222

Merge "Bump version to 1.0-mr3" into ub-jack-arzon

jill/src/com/android/jill/Main.java

diff --git a/jill/src/com/android/jill/Main.java b/jill/src/com/android/jill/Main.java
index b7f42b2..f514a1f 100644
--- a/jill/src/com/android/jill/Main.java
+++ b/jill/src/com/android/jill/Main.java
@@ -144,8 +144,13 @@
             version += " \'" + codeName + '\'';
           }
 
-          String codeBase = prop.getProperty("jill.version.codebase", "engineering");
-          version += " (" + codeBase + ")";
+          String bid = prop.getProperty("jill.version.buildid", "engineering");
+          String sha = prop.getProperty("jill.version.sha");
+          if (sha != null) {
+            version += " (" + bid + ' ' + sha + ')';
+          } else {
+            version += " (" + bid + ')';
+          }
         }
       } catch (IOException e) {
         // Return default version