diff options
| author | Jean-Philippe Lesot <jplesot@google.com> | 2015-01-06 15:04:54 +0100 |
|---|---|---|
| committer | Jean-Philippe Lesot <jplesot@google.com> | 2015-01-06 15:13:36 +0100 |
| commit | 502737f212b25ad849672f8c03f84d90df37eb3f (patch) | |
| tree | 61371f2ed5b305f9313fd15c800c4989dfbfdc82 | |
| parent | 0f5335fb7a5710a26826df215d31289d91868d91 (diff) | |
| download | toolchain_jill-502737f212b25ad849672f8c03f84d90df37eb3f.zip toolchain_jill-502737f212b25ad849672f8c03f84d90df37eb3f.tar.gz toolchain_jill-502737f212b25ad849672f8c03f84d90df37eb3f.tar.bz2 | |
Split jill.version.codebase property
Into jill.version.buildid and jill.version.sha
Change-Id: I905a4229d5d3d69b0f8648481d8d63c31a1fe850
| -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 |