summaryrefslogtreecommitdiffstats
path: root/tools/aapt
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-09-02 17:59:51 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-02 17:59:51 -0700
commitf156e752b50ec3bfe013c6a7af6b1c16b0dfa611 (patch)
tree2f50ebd88056b77b519b8f36b55a2c36265d0569 /tools/aapt
parent0a01f076d221ccdaf360cac83e42e92b97ee3900 (diff)
parent31103928ed5b9091bcd7de74c8a49675d10c87e7 (diff)
downloadframeworks_base-f156e752b50ec3bfe013c6a7af6b1c16b0dfa611.zip
frameworks_base-f156e752b50ec3bfe013c6a7af6b1c16b0dfa611.tar.gz
frameworks_base-f156e752b50ec3bfe013c6a7af6b1c16b0dfa611.tar.bz2
am 31103928: am 192b56d4: Merge "Implement #2964234: Add support for <uses-package> element to aapt" into gingerbread
Merge commit '31103928ed5b9091bcd7de74c8a49675d10c87e7' * commit '31103928ed5b9091bcd7de74c8a49675d10c87e7': Implement #2964234: Add support for <uses-package> element to aapt
Diffstat (limited to 'tools/aapt')
-rw-r--r--tools/aapt/Command.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp
index b50a393..eaff0f4 100644
--- a/tools/aapt/Command.cpp
+++ b/tools/aapt/Command.cpp
@@ -856,6 +856,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 == "") {