diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-05-15 21:17:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-15 21:17:33 +0000 |
| commit | 9e1e95f6e3af79f0d659afa2476e462fdac2f5e2 (patch) | |
| tree | df921db7a3f6dde664cc595aaf2dd3fb2d29f2f7 /tools | |
| parent | fa3b85cf51417c2ab87807d1c95cd990f3b4b25a (diff) | |
| parent | b71adb6571aa740f4fa794602133f708e1b96545 (diff) | |
| download | frameworks_base-9e1e95f6e3af79f0d659afa2476e462fdac2f5e2.zip frameworks_base-9e1e95f6e3af79f0d659afa2476e462fdac2f5e2.tar.gz frameworks_base-9e1e95f6e3af79f0d659afa2476e462fdac2f5e2.tar.bz2 | |
Merge "AAPT dump badging should allow refs in meta-data"
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/aapt/Command.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp index 24a94a7..4e0a9fe 100644 --- a/tools/aapt/Command.cpp +++ b/tools/aapt/Command.cpp @@ -1454,7 +1454,7 @@ int doDump(Bundle* bundle) " 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()); |