From df8e4802115fadd6bb67ba405aba2db885abbd55 Mon Sep 17 00:00:00 2001
From: Ben Gruver <bgruv@google.com>
Date: Tue, 30 Apr 2013 20:43:57 -0700
Subject: [PATCH] Write the correct header version based on the api level

---
 .../main/java/org/jf/dexlib2/writer/DexWriter.java  | 13 ++++++++++---
 .../org/jf/dexlib2/writer/builder/DexBuilder.java   | 11 ++++++++---
 .../java/org/jf/dexlib2/writer/pool/DexPool.java    | 13 ++++++++-----
 smali/src/main/java/org/jf/smali/main.java          |  2 +-
 4 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/dexlib2/src/main/java/org/jf/dexlib2/writer/DexWriter.java b/dexlib2/src/main/java/org/jf/dexlib2/writer/DexWriter.java
index 63289fd9..7378673a 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/writer/DexWriter.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/writer/DexWriter.java
@@ -80,6 +80,8 @@ public abstract class DexWriter<
     public static final int NO_INDEX = -1;
     public static final int NO_OFFSET = 0;
 
+    protected final int api;
+
     protected int stringIndexSectionOffset = NO_OFFSET;
     protected int typeSectionOffset = NO_OFFSET;
     protected int protoSectionOffset = NO_OFFSET;
@@ -120,7 +122,8 @@ public abstract class DexWriter<
     protected final AnnotationSection<StringKey, TypeKey, AnnotationKey, AnnotationElement, EncodedValue> annotationSection;
     protected final AnnotationSetSection<AnnotationKey, AnnotationSetKey> annotationSetSection;
 
-    protected DexWriter(InstructionFactory<? extends Insn, BaseReference> instructionFactory,
+    protected DexWriter(int api,
+                        InstructionFactory<? extends Insn, BaseReference> instructionFactory,
                         StringSection<StringKey, StringRef> stringSection,
                         TypeSection<StringKey, TypeKey, TypeRef> typeSection,
                         ProtoSection<StringKey, TypeKey, ProtoKey, TypeListKey> protoSection,
@@ -132,6 +135,7 @@ public abstract class DexWriter<
                         AnnotationSection<StringKey, TypeKey, AnnotationKey, AnnotationElement,
                                 EncodedValue> annotationSection,
                         AnnotationSetSection<AnnotationKey, AnnotationSetKey> annotationSetSection) {
+        this.api = api;
         this.instructionFactory = instructionFactory;
         this.stringSection = stringSection;
         this.typeSection = typeSection;
@@ -1089,8 +1093,11 @@ public abstract class DexWriter<
     }
 
     private void writeHeader(@Nonnull DexDataWriter writer, int dataOffset, int fileSize) throws IOException {
-        // TODO: need to determine which magic value to write
-        writer.write(HeaderItem.MAGIC_VALUES[0]);
+        if (api < 14) {
+            writer.write(HeaderItem.MAGIC_VALUES[0]);
+        } else {
+            writer.write(HeaderItem.MAGIC_VALUES[1]);
+        }
 
         // checksum placeholder
         writer.writeInt(0);
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/writer/builder/DexBuilder.java b/dexlib2/src/main/java/org/jf/dexlib2/writer/builder/DexBuilder.java
index c5777eee..913765f3 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/writer/builder/DexBuilder.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/writer/builder/DexBuilder.java
@@ -62,11 +62,16 @@ public class DexBuilder extends DexWriter<BuilderStringReference, BuilderStringR
 
     public static DexBuilder makeDexBuilder() {
         BuilderContext context = new BuilderContext();
-        return new DexBuilder(context);
+        return new DexBuilder(15, context);
     }
 
-    private DexBuilder(@Nonnull BuilderContext context) {
-        super(BuilderInstructionFactory.INSTANCE, context.stringPool, context.typePool, context.protoPool,
+    public static DexBuilder makeDexBuilder(int api) {
+        BuilderContext context = new BuilderContext();
+        return new DexBuilder(api, context);
+    }
+
+    private DexBuilder(int api, @Nonnull BuilderContext context) {
+        super(api, BuilderInstructionFactory.INSTANCE, context.stringPool, context.typePool, context.protoPool,
                 context.fieldPool, context.methodPool, context.classPool, context.typeListPool, context.annotationPool,
                 context.annotationSetPool);
         this.context = context;
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/writer/pool/DexPool.java b/dexlib2/src/main/java/org/jf/dexlib2/writer/pool/DexPool.java
index 3b1674ab..1eda265a 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/writer/pool/DexPool.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/writer/pool/DexPool.java
@@ -54,6 +54,10 @@ public class DexPool extends DexWriter<CharSequence, StringReference, CharSequen
         EncodedValue, AnnotationElement, DebugItem, Instruction, ExceptionHandler> {
 
     public static DexPool makeDexPool() {
+        return makeDexPool(15);
+    }
+
+    public static DexPool makeDexPool(int api) {
         StringPool stringPool = new StringPool();
         TypePool typePool = new TypePool(stringPool);
         FieldPool fieldPool = new FieldPool(stringPool, typePool);
@@ -65,16 +69,15 @@ public class DexPool extends DexWriter<CharSequence, StringReference, CharSequen
         ClassPool classPool = new ClassPool(stringPool, typePool, fieldPool, methodPool, annotationSetPool,
                 typeListPool);
 
-        return new DexPool(stringPool, typePool, protoPool, fieldPool, methodPool, classPool, typeListPool,
+        return new DexPool(api, stringPool, typePool, protoPool, fieldPool, methodPool, classPool, typeListPool,
                 annotationPool, annotationSetPool);
-
     }
 
-    private DexPool(StringPool stringPool, TypePool typePool, ProtoPool protoPool, FieldPool fieldPool,
+    private DexPool(int api, StringPool stringPool, TypePool typePool, ProtoPool protoPool, FieldPool fieldPool,
                     MethodPool methodPool, ClassPool classPool, TypeListPool typeListPool,
                     AnnotationPool annotationPool, AnnotationSetPool annotationSetPool) {
-        super(ImmutableInstructionFactory.INSTANCE, stringPool, typePool, protoPool, fieldPool, methodPool, classPool,
-                typeListPool, annotationPool, annotationSetPool);
+        super(api, ImmutableInstructionFactory.INSTANCE, stringPool, typePool, protoPool, fieldPool, methodPool,
+                classPool, typeListPool, annotationPool, annotationSetPool);
     }
 
     public static void writeTo(@Nonnull String path, @Nonnull org.jf.dexlib2.iface.DexFile input) throws IOException {
diff --git a/smali/src/main/java/org/jf/smali/main.java b/smali/src/main/java/org/jf/smali/main.java
index 3a443d28..9b2c9652 100644
--- a/smali/src/main/java/org/jf/smali/main.java
+++ b/smali/src/main/java/org/jf/smali/main.java
@@ -185,7 +185,7 @@ public class main {
 
             boolean errors = false;
 
-            final DexBuilder dexBuilder = DexBuilder.makeDexBuilder();
+            final DexBuilder dexBuilder = DexBuilder.makeDexBuilder(apiLevel);
             ExecutorService executor = Executors.newFixedThreadPool(jobs);
             List<Future<Boolean>> tasks = Lists.newArrayList();