commit 9e1e95f6e3af79f0d659afa2476e462fdac2f5e2
author Adam Lesinski <adamlesinski@google.com> Thu May 15 21:17:32 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 15 21:17:33 2014 +0000
tree df921db7a3f6dde664cc595aaf2dd3fb2d29f2f7
parent fa3b85cf51417c2ab87807d1c95cd990f3b4b25a
parent b71adb6571aa740f4fa794602133f708e1b96545

Merge "AAPT dump badging should allow refs in meta-data"

tools/aapt/Command.cpp

diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp
index 24a94a7e..4e0a9fe 100644
--- a/tools/aapt/Command.cpp
+++ b/tools/aapt/Command.cpp
@@ -1454,7 +1454,7 @@
                                         " service '%s': %s\n", serviceName.string(), error.string());
                             }
                         } else if (bundle->getIncludeMetaData() && tag == "meta-data") {
-                            String8 metaDataName = getAttribute(tree, NAME_ATTR, &error);
+                            String8 metaDataName = getResolvedAttribute(&res, tree, NAME_ATTR, &error);
                             if (error != "") {
                                 fprintf(stderr, "ERROR getting 'android:name' attribute for "
                                         "meta-data:%s\n", error.string());