summaryrefslogtreecommitdiffstats
path: root/jill/src
diff options
context:
space:
mode:
authorJean-Philippe Lesot <jplesot@google.com>2014-09-18 14:55:38 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-09-18 14:55:38 +0000
commit22e72bcdf18672c22861427932c3e12b02b2c242 (patch)
treef55e2768eda03a3a06d42267c6bcdf85983e9792 /jill/src
parentbf47cacf43a3b158f4bec0274a4a67566af6ae96 (diff)
parent700bb2bd54d305a80bf8d8be5b8fe561356e782d (diff)
downloadtoolchain_jill-22e72bcdf18672c22861427932c3e12b02b2c242.zip
toolchain_jill-22e72bcdf18672c22861427932c3e12b02b2c242.tar.gz
toolchain_jill-22e72bcdf18672c22861427932c3e12b02b2c242.tar.bz2
Merge "Add code base support in Jill" into ub-jack
Diffstat (limited to 'jill/src')
-rw-r--r--jill/src/com/android/jill/Main.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/jill/src/com/android/jill/Main.java b/jill/src/com/android/jill/Main.java
index a6d0601..a9a6885 100644
--- a/jill/src/com/android/jill/Main.java
+++ b/jill/src/com/android/jill/Main.java
@@ -117,6 +117,11 @@ public class Main {
Properties prop = new Properties();
prop.load(is);
version = prop.getProperty("jill.version", "Unknown (no jill.version entry)");
+
+ String codeBase = prop.getProperty("jill.version.codebase");
+ if (codeBase != null) {
+ version += " (" + codeBase + ")";
+ }
}
return version;