From fac43a62b83ddf0282c02a584783624673068c59 Mon Sep 17 00:00:00 2001 From: Connor Tumbleson Date: Sat, 14 Mar 2015 08:20:00 -0500 Subject: [PATCH] remove dependency on sharedLibrary in apktool.yml --- .../apktool-lib/src/main/java/brut/androlib/Androlib.java | 2 +- .../src/test/resources/brut/apktool/testapp/apktool.yml | 1 - .../src/test/resources/brut/apktool/testjar/apktool.yml | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java index 9b77bed1..d380e093 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java @@ -270,7 +270,7 @@ public class Androlib { mAndRes.setPackageId((Map) meta.get("packageInfo")); mAndRes.setPackageInfo((Map) meta.get("packageInfo")); mAndRes.setVersionInfo((Map) meta.get("versionInfo")); - mAndRes.setSharedLibrary((boolean) meta.get("sharedLibrary")); + mAndRes.setSharedLibrary((boolean) (meta.get("sharedLibrary") == null ? false : meta.get("sharedLibrary"))); if (outFile == null) { String outFileName = (String) meta.get("apkFileName"); diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/apktool.yml b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/apktool.yml index 967ade59..51536bc9 100644 --- a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/apktool.yml +++ b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/apktool.yml @@ -10,7 +10,6 @@ versionInfo: versionCode: '1' versionName: '1.0' compressionType: false -sharedLibrary: false unknownFiles: hidden.file: '8' unk_folder/unknown_file: '8' diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testjar/apktool.yml b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testjar/apktool.yml index f2ad0b25..f0d049ba 100644 --- a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testjar/apktool.yml +++ b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testjar/apktool.yml @@ -1,3 +1,2 @@ version: 2.0.0 -apkFileName: testjar.jar -sharedLibrary: false +apkFileName: testjar.jar \ No newline at end of file