diff options
| author | mikaelpeltier <mikaelpeltier@google.com> | 2014-11-13 09:34:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-13 09:34:43 +0000 |
| commit | dbc92299280b4bfb665ef23b8c469f82b1a04b29 (patch) | |
| tree | 54dc6e4799696f6fc14091e885db555cafde5bb1 | |
| parent | 688e69190e30c6433586e60a773bf0a8c9ce0a31 (diff) | |
| parent | b5d0ee3dcb1930404e333e79f9162494fb7cb065 (diff) | |
| download | toolchain_jill-dbc92299280b4bfb665ef23b8c469f82b1a04b29.zip toolchain_jill-dbc92299280b4bfb665ef23b8c469f82b1a04b29.tar.gz toolchain_jill-dbc92299280b4bfb665ef23b8c469f82b1a04b29.tar.bz2 | |
Merge "Now, jill generates library 1.0 with Jayce 2.15" into ub-jack
| -rw-r--r-- | jill/src/com/android/jill/backend/jayce/JayceWriter.java | 5 | ||||
| -rw-r--r-- | jill/src/com/android/jill/frontend/java/JavaTransformer.java | 12 |
2 files changed, 4 insertions, 13 deletions
diff --git a/jill/src/com/android/jill/backend/jayce/JayceWriter.java b/jill/src/com/android/jill/backend/jayce/JayceWriter.java index f40f8db..07e418b 100644 --- a/jill/src/com/android/jill/backend/jayce/JayceWriter.java +++ b/jill/src/com/android/jill/backend/jayce/JayceWriter.java @@ -220,11 +220,6 @@ public class JayceWriter { writeStringInternal(id); } - public void writeHeader(@Nonnull String header) throws IOException { - writers.peek().writeBytes(header); - writeSpace(); - } - private void writeStringInternal(@CheckForNull String string) throws IOException { writers.peek().writeUTF(string); } diff --git a/jill/src/com/android/jill/frontend/java/JavaTransformer.java b/jill/src/com/android/jill/frontend/java/JavaTransformer.java index 04b610b..f0215e5 100644 --- a/jill/src/com/android/jill/frontend/java/JavaTransformer.java +++ b/jill/src/com/android/jill/frontend/java/JavaTransformer.java @@ -48,7 +48,7 @@ import javax.annotation.Nonnull; public class JavaTransformer { @Nonnull - private static final String LIB_MAJOR_VERSION = "0"; + private static final String LIB_MAJOR_VERSION = "1"; @Nonnull private static final String LIB_MINOR_VERSION = "0"; @@ -57,7 +57,7 @@ public class JavaTransformer { private static final String JAYCE_MAJOR_VERSION = "2"; @Nonnull - private static final String JAYCE_MINOR_VERSION = "14"; + private static final String JAYCE_MINOR_VERSION = "15"; @Nonnull private static final String KEY_LIB_MAJOR_VERSION = "lib.version.major"; @@ -366,13 +366,9 @@ public class JavaTransformer { } } - private JayceWriter createWriter(@Nonnull OutputStream os) throws IOException { + private JayceWriter createWriter(@Nonnull OutputStream os) { JayceWriter writer = new JayceWriter(os); - - writer.writeHeader( - "jayce(" + JAYCE_MAJOR_VERSION + "." + JAYCE_MINOR_VERSION + " \"jill " + version + "\")"); - - return writer; + return writer; } @Nonnull |