diff options
author | Yohann Roussel <yroussel@google.com> | 2015-06-16 16:50:29 +0200 |
---|---|---|
committer | Jean-Marie Henaff <jmhenaff@google.com> | 2015-06-25 11:41:04 +0200 |
commit | b6ea74db520f823ac87b8342f9a3f08823ff9409 (patch) | |
tree | d35c992acc9f33cad42c6dc6dfded30ccf37cc5b /jill/src/com/android/jill/Jill.java | |
parent | 7aaebee57c764df1b453ede1e1979dc5c551ca99 (diff) | |
download | toolchain_jill-b6ea74db520f823ac87b8342f9a3f08823ff9409.tar.gz toolchain_jill-b6ea74db520f823ac87b8342f9a3f08823ff9409.tar.bz2 toolchain_jill-b6ea74db520f823ac87b8342f9a3f08823ff9409.zip |
Use schedlib Version in Jill
(cherry picked from commit 8ed0a0157dc249d2d79d29099404aaaced3f8965)
Change-Id: I851fb9923ea185043f4cbfb7c8c073f2d9343cac
Diffstat (limited to 'jill/src/com/android/jill/Jill.java')
-rw-r--r-- | jill/src/com/android/jill/Jill.java | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/jill/src/com/android/jill/Jill.java b/jill/src/com/android/jill/Jill.java index 0017175..6e1e9ac 100644 --- a/jill/src/com/android/jill/Jill.java +++ b/jill/src/com/android/jill/Jill.java @@ -18,10 +18,10 @@ package com.android.jill; import com.android.jill.frontend.java.JavaTransformer; import com.android.jill.utils.FileUtils; +import com.android.sched.util.Version; import java.io.File; import java.io.IOException; -import java.io.InputStream; import java.util.ArrayList; import java.util.List; import java.util.jar.JarFile; @@ -34,8 +34,6 @@ import javax.annotation.Nonnull; */ public class Jill { - @Nonnull - private static final String PROPERTIES_FILE = "jill.properties"; @CheckForNull private static Version version = null; @@ -66,11 +64,10 @@ public class Jill { @Nonnull public static Version getVersion() { if (version == null) { - InputStream is = Jill.class.getClassLoader().getResourceAsStream(PROPERTIES_FILE); - if (is != null) { - version = new Version(is); - } else { - System.err.println("Failed to open Jack properties file " + PROPERTIES_FILE); + try { + version = new Version("jill", Jill.class.getClassLoader()); + } catch (IOException e) { + System.err.println("Failed to read version properties file: " + e.getMessage()); throw new AssertionError(); } } |