diff --git a/INTERNAL.md b/INTERNAL.md index 892c0afd..e9723dbe 100644 --- a/INTERNAL.md +++ b/INTERNAL.md @@ -222,7 +222,10 @@ to get the source downloaded. This is no small download, expect to use 40-60GB. After that, you need to build AOSP via this [documentation](https://source.android.com/source/building.html) guide. Now we aren't building the entire AOSP package, the initial build is to just see if you are capable of building it. -We check out a certain tag. Currently we use `android-8.1.0_r23`. +We check out a certain tag. Currently we use + + * aapt2 - `master#05c09faad2ab67ada8d354440680d40176841b6c`. + * aapt1 - `android-8.1.0_r9`. ### Including our modified `frameworks/base` package. diff --git a/brut.apktool/apktool-lib/src/main/resources/prebuilt/aapt2/linux/aapt2 b/brut.apktool/apktool-lib/src/main/resources/prebuilt/aapt2/linux/aapt2 index 0c626db3..16c662a1 100755 Binary files a/brut.apktool/apktool-lib/src/main/resources/prebuilt/aapt2/linux/aapt2 and b/brut.apktool/apktool-lib/src/main/resources/prebuilt/aapt2/linux/aapt2 differ diff --git a/brut.apktool/apktool-lib/src/main/resources/prebuilt/aapt2/macosx/aapt2 b/brut.apktool/apktool-lib/src/main/resources/prebuilt/aapt2/macosx/aapt2 index 8f6adbcb..54a070d4 100755 Binary files a/brut.apktool/apktool-lib/src/main/resources/prebuilt/aapt2/macosx/aapt2 and b/brut.apktool/apktool-lib/src/main/resources/prebuilt/aapt2/macosx/aapt2 differ diff --git a/brut.apktool/apktool-lib/src/main/resources/prebuilt/aapt2/windows/aapt2.exe b/brut.apktool/apktool-lib/src/main/resources/prebuilt/aapt2/windows/aapt2.exe index cb86c8ad..4af0425e 100755 Binary files a/brut.apktool/apktool-lib/src/main/resources/prebuilt/aapt2/windows/aapt2.exe and b/brut.apktool/apktool-lib/src/main/resources/prebuilt/aapt2/windows/aapt2.exe differ diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt2/BuildAndDecodeTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt2/BuildAndDecodeTest.java index 20c77d35..6b0b66d8 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt2/BuildAndDecodeTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt2/BuildAndDecodeTest.java @@ -72,6 +72,11 @@ public class BuildAndDecodeTest extends BaseTest { compareValuesFiles("values/strings.xml"); } + @Test + public void navigationResourceTest() throws BrutException { + compareXmlFiles("res/navigation/nav_graph.xml"); + } + @Test public void confirmManifestStructureTest() throws BrutException { compareXmlFiles("AndroidManifest.xml"); diff --git a/brut.apktool/apktool-lib/src/test/resources/aapt2/testapp/res/navigation/nav_graph.xml b/brut.apktool/apktool-lib/src/test/resources/aapt2/testapp/res/navigation/nav_graph.xml new file mode 100644 index 00000000..9eebbbc3 --- /dev/null +++ b/brut.apktool/apktool-lib/src/test/resources/aapt2/testapp/res/navigation/nav_graph.xml @@ -0,0 +1,3 @@ + + +