[bit] Use aapt2 instead of aapt, and don't also adb install apps on the system partition

Test: bit services
Change-Id: I7d44ffbb2745b1a6265bbc77f24f885e5f1d3981

1 files changed, 4 insertions, 3 deletions

diff --git a/tools/bit/aapt.cpp b/tools/bit/aapt.cpp
index 961b47cdfecd..cee0cd52a546 100644
--- a/tools/bit/aapt.cpp
+++ b/tools/bit/aapt.cpp
@@ -159,10 +159,11 @@ int
 inspect_apk(Apk* apk, const string& filename)
 {
     // Load the manifest xml
-    Command cmd("aapt");
+    Command cmd("aapt2");
     cmd.AddArg("dump");
     cmd.AddArg("xmltree");
     cmd.AddArg(filename);
+    cmd.AddArg("--file");
     cmd.AddArg("AndroidManifest.xml");
 
     int err;
@@ -217,11 +218,11 @@ inspect_apk(Apk* apk, const string& filename)
             if (current != NULL) {
                 Attribute attr;
                 string str = match[2];
-                size_t colon = str.find(':');
+                size_t colon = str.rfind(':');
                 if (colon == string::npos) {
                     attr.name = str;
                 } else {
-                    attr.ns = scope->namespaces[string(str, 0, colon)];
+                    attr.ns.assign(str, 0, colon);
                     attr.name.assign(str, colon+1, string::npos);
                 }
                 attr.value = match[3];