From 06f824afadee15e94b4192e6bf75868b104cc56b Mon Sep 17 00:00:00 2001
From: Benoit Lamarche <benoitlamarche@google.com>
Date: Mon, 16 Jun 2014 18:31:52 +0200
Subject: Remove emitterId and simplify Jayce header

Change-Id: I042ec268e660563da5b9deb0aed505a9cf6a5cbb
---
 jill/src/com/android/jill/Jill.java                          | 3 ---
 jill/src/com/android/jill/frontend/java/JavaTransformer.java | 3 +--
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/jill/src/com/android/jill/Jill.java b/jill/src/com/android/jill/Jill.java
index c67b8bf..f32dd18 100644
--- a/jill/src/com/android/jill/Jill.java
+++ b/jill/src/com/android/jill/Jill.java
@@ -38,9 +38,6 @@ public class Jill {
   @Nonnull
   private final String version;
 
-  @Nonnull
-  public static final String FILE_ENCODING = "UTF-8";
-
   public Jill(@Nonnull Options options, @Nonnull String version) {
     this.options = options;
     this.version = version;
diff --git a/jill/src/com/android/jill/frontend/java/JavaTransformer.java b/jill/src/com/android/jill/frontend/java/JavaTransformer.java
index fae67d9..c02c2f3 100644
--- a/jill/src/com/android/jill/frontend/java/JavaTransformer.java
+++ b/jill/src/com/android/jill/frontend/java/JavaTransformer.java
@@ -17,7 +17,6 @@
 package com.android.jill.frontend.java;
 
 import com.android.jill.ContainerType;
-import com.android.jill.Jill;
 import com.android.jill.JillException;
 import com.android.jill.Options;
 import com.android.jill.backend.jayce.JayceWriter;
@@ -280,7 +279,7 @@ public class JavaTransformer {
     JayceWriter writer = new JayceWriter(os);
 
       writer.writeHeader(
-          "jayce(2.13 \"" + Jill.FILE_ENCODING + "\" \"Jill version : " + version + "\")");
+          "jayce(2.14 \"jill " + version + "\")");
 
       return writer;
   }
-- 
cgit v1.2.3