From f5caccbc2e16c1f53b8d4995dd3c52dddfcbfd66 Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <connor@sourcetoad.com>
Date: Thu, 15 Feb 2018 18:04:47 -0500
Subject: [PATCH] aapt2: flag for aapt2 and sparse resources to
 meta-info/apkOptions

---
 .../src/main/java/brut/androlib/ApkOptions.java            | 7 +++++++
 .../src/main/java/brut/androlib/meta/MetaInfo.java         | 5 +++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkOptions.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkOptions.java
index 5850b54a..0a81ef07 100644
--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkOptions.java
+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkOptions.java
@@ -27,9 +27,16 @@ public class ApkOptions {
     public boolean updateFiles = false;
     public boolean isFramework = false;
     public boolean resourcesAreCompressed = false;
+    public boolean useAapt2 = false;
     public Collection<String> doNotCompress;
 
     public String frameworkFolderLocation = null;
     public String frameworkTag = null;
     public String aaptPath = "";
+
+    public int aaptVersion = 1; // default to v1
+
+    public boolean isAapt2() {
+        return this.useAapt2 || this.aaptVersion == 2;
+    }
 }
diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/meta/MetaInfo.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/meta/MetaInfo.java
index f2f8cb03..7da11d4d 100644
--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/meta/MetaInfo.java
+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/meta/MetaInfo.java
@@ -35,6 +35,7 @@ public class MetaInfo {
     public VersionInfo versionInfo;
     public boolean compressionType;
     public boolean sharedLibrary;
+    public boolean sparseResources;
     public Map<String, String> unknownFiles;
     public Collection<String> doNotCompress;
 
@@ -60,7 +61,7 @@ public class MetaInfo {
                 FileOutputStream fos = new FileOutputStream(file);
                 OutputStreamWriter outputStreamWriter = new OutputStreamWriter(fos, StandardCharsets.UTF_8);
                 Writer writer = new BufferedWriter(outputStreamWriter)
-        ){
+        ) {
             save(writer);
         }
     }
@@ -72,7 +73,7 @@ public class MetaInfo {
     public static MetaInfo load(File file) throws IOException {
         try (
                 InputStream fis = new FileInputStream(file)
-        ){
+        ) {
             return load(fis);
         }
     }