am 192b56d4: Merge "Implement #2964234: Add support for <uses-package> element to...

Merge commit '192b56d42a4f6e5e6c736b0f22dd5bd201b02c9d' into gingerbread-plus-aosp

* commit '192b56d42a4f6e5e6c736b0f22dd5bd201b02c9d':
  Implement #2964234: Add support for <uses-package> element to aapt

diff --git a/Command.cpp b/Command.cpp
index b0f086bf6bc2df6eea9d5f81ac21bef633641028..f71ebb98344f289a7801ddc1058269c4f76cb2a2 100644 (file)
--- a/Command.cpp
+++ b/Command.cpp
@@ -853,6 +853,15 @@ int doDump(Bundle* bundle)
                                     error.string());
                             goto bail;
                         }
+                    } else if (tag == "uses-package") {
+                        String8 name = getAttribute(tree, NAME_ATTR, &error);
+                        if (name != "" && error == "") {
+                            printf("uses-package:'%s'\n", name.string());
+                        } else {
+                            fprintf(stderr, "ERROR getting 'android:name' attribute: %s\n",
+                                    error.string());
+                                goto bail;
+                        }
                     } else if (tag == "original-package") {
                         String8 name = getAttribute(tree, NAME_ATTR, &error);
                         if (name != "" && error == "") {