Merge pull request #1788 from iBotPeaches/issue-1776

Add new aapt2 binaries

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.
 

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");

brut.apktool/apktool-lib/src/test/resources/aapt2/testapp/res/navigation/nav_graph.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<navigation xmlns:android="http://schemas.android.com/apk/res/android">
+</navigation>