From ebfb9e3038c3696b18d3a00cfd43c4e4febecd14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ryszard=20Wi=C5=9Bniewski?= <brut.alll@gmail.com>
Date: Wed, 2 Jun 2010 09:37:19 +0200
Subject: [PATCH] Storing isFrameworkApk bool in apktool.yml instead of
 guessing it at build time.

---
 src/brut/androlib/Androlib.java   | 12 +++++++++++-
 src/brut/androlib/ApkDecoder.java |  2 ++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/brut/androlib/Androlib.java b/src/brut/androlib/Androlib.java
index b7ac28e3..b369fe82 100644
--- a/src/brut/androlib/Androlib.java
+++ b/src/brut/androlib/Androlib.java
@@ -19,6 +19,7 @@ package brut.androlib;
 
 import brut.androlib.java.AndrolibJava;
 import brut.androlib.res.AndrolibResources;
+import brut.androlib.res.data.ResPackage;
 import brut.androlib.res.data.ResTable;
 import brut.androlib.res.decoder.ARSCDecoder;
 import brut.androlib.res.decoder.ARSCDecoder.FlagsOffset;
@@ -152,8 +153,8 @@ public class Androlib {
 
     public void build(ExtFile appDir, boolean forceBuildAll, boolean debug)
             throws AndrolibException {
-        boolean framework = mAndRes.detectWhetherAppIsFramework(appDir);
         Map<String, Object> meta = readMetaFile(appDir);
+        boolean framework = (Boolean) meta.get("isFrameworkApk");
 
         new File(appDir, APK_DIRNAME).mkdirs();
         buildSources(appDir, forceBuildAll, debug);
@@ -361,6 +362,15 @@ public class Androlib {
         }
     }
 
+    public boolean isFrameworkApk(ResTable resTable) {
+        for (ResPackage pkg : resTable.listMainPackages()) {
+            if (pkg.getId() < 64) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     public static String getVersion() {
         return VERSION;
     }
diff --git a/src/brut/androlib/ApkDecoder.java b/src/brut/androlib/ApkDecoder.java
index c2259205..280a5c86 100644
--- a/src/brut/androlib/ApkDecoder.java
+++ b/src/brut/androlib/ApkDecoder.java
@@ -163,6 +163,8 @@ public class ApkDecoder {
     private void writeMetaFile() throws AndrolibException {
         Map<String, Object> meta = new LinkedHashMap<String, Object>();
         meta.put("version", Androlib.getVersion());
+        meta.put("isFrameworkApk",
+            Boolean.valueOf(mAndrolib.isFrameworkApk(getResTable())));
         mAndrolib.writeMetaFile(mOutDir, meta);
     }