diff options
| author | Jean-Philippe Lesot <jplesot@google.com> | 2015-01-06 14:33:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-06 14:33:40 +0000 |
| commit | d9e65ed28424e470df2605c019465ded87f1777c (patch) | |
| tree | 1f16cb10f4459ff961f8b8536cd921aafc7df9ef | |
| parent | 1002310f9c719ef77a5f4dd34687f8e3889de26a (diff) | |
| parent | 502737f212b25ad849672f8c03f84d90df37eb3f (diff) | |
| download | toolchain_jill-d9e65ed28424e470df2605c019465ded87f1777c.zip toolchain_jill-d9e65ed28424e470df2605c019465ded87f1777c.tar.gz toolchain_jill-d9e65ed28424e470df2605c019465ded87f1777c.tar.bz2 | |
Merge "Split jill.version.codebase property" into ub-jack
| -rw-r--r-- | jill/src/com/android/jill/Main.java | 9 |
1 files changed, 7 insertions, 2 deletions
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 @@ public class Main { 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 |