From 513e4b752b7b4af4b788ea55c49d16124d6928ca Mon Sep 17 00:00:00 2001
From: Andrei Zhukouski <BurgerZ@users.noreply.github.com>
Date: Fri, 22 Apr 2016 08:32:42 +0300
Subject: [PATCH] Copy AndroidManifest.xml

Copy AndroidManifest.xml along with resources.arsc from the framework apk file instead of creating the fake entry.
---
 .../brut/androlib/res/AndrolibResources.java  | 38 +++++++------------
 1 file changed, 13 insertions(+), 25 deletions(-)

diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java
index 4e8fd10e..1088cd66 100644
--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java
+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java
@@ -624,11 +624,19 @@ final public class AndrolibResources {
             out.closeEntry();
             
             //Write fake AndroidManifest.xml file to support original aapt
-            byte[] manifest = createAndroidManifestFileData();
-            entry = createAndroidManifestEntry(manifest);
-            out.putNextEntry(entry);
-            out.write(manifest);
-            out.closeEntry();
+            entry = zip.getEntry("AndroidManifest.xml");
+            if (entry != null) {
+                in = zip.getInputStream(entry);
+                byte[] manifest = IOUtils.toByteArray(in);
+                CRC32 manifestCrc = new CRC32();
+                manifestCrc.update(manifest);
+                entry.setSize(manifest.length);
+                entry.setCompressedSize(-1);
+                entry.setCrc(manifestCrc.getValue());
+                out.putNextEntry(entry);
+                out.write(manifest);
+                out.closeEntry();
+            }
 
             zip.close();
             LOGGER.info("Framework installed to: " + outFile);
@@ -639,26 +647,6 @@ final public class AndrolibResources {
             IOUtils.closeQuietly(out);
         }
     }
-    
-    private ZipEntry createAndroidManifestEntry(byte[] data) throws IOException {
-        ZipEntry entry = new ZipEntry("AndroidManifest.xml");
-        CRC32 crc = new CRC32();
-        crc.update(data);
-        entry.setSize(data.length);
-        entry.setCrc(crc.getValue());
-        return entry;
-    }
-
-    private byte[] createAndroidManifestFileData() throws IOException {
-        File temp = File.createTempFile("AndroidManifest", ".tmp");
-        BufferedWriter bw = new BufferedWriter(new FileWriter(temp));
-        bw.write("AndroidManifest.xml for official aapt");
-        bw.close();
-        InputStream in = new FileInputStream(temp);
-        byte[] data = IOUtils.toByteArray(in);
-        in.close();
-        return data;
-    }
 
     public void publicizeResources(File arscFile) throws AndrolibException {
         byte[] data = new byte[(int) arscFile.length()];