diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2016-08-12 11:35:17 -0700 |
|---|---|---|
| committer | Chih-Hung Hsieh <chh@google.com> | 2016-08-12 11:44:16 -0700 |
| commit | b3d46b44a399ba0a9b14caac8603db15089ab55b (patch) | |
| tree | 94e2f4c534e4ae9b80dce102aa1f1b3fce89ac5c /tools/aapt/Command.cpp | |
| parent | ed935c32f478229220a90442da0af3c3d3fc6230 (diff) | |
| parent | 17bd236b4b6b78c32a187649aa4abcf94e5951c3 (diff) | |
resolve merge conflicts of 17bd236 to stage-aosp-master
Change-Id: I08d4500aaa378b08d41e8d046c62101e08dbfba8
Diffstat (limited to 'tools/aapt/Command.cpp')
| -rw-r--r-- | tools/aapt/Command.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp index 9976d00fa872..78720b32a01a 100644 --- a/tools/aapt/Command.cpp +++ b/tools/aapt/Command.cpp @@ -248,7 +248,7 @@ bail: } static void printResolvedResourceAttribute(const ResTable& resTable, const ResXMLTree& tree, - uint32_t attrRes, String8 attrLabel, String8* outError) + uint32_t attrRes, const String8& attrLabel, String8* outError) { Res_value value; AaptXml::getResolvedResourceAttribute(resTable, tree, attrRes, &value, outError); @@ -399,7 +399,7 @@ static void printUsesImpliedPermission(const String8& name, const String8& reaso ResTable::normalizeForOutput(reason.string()).string()); } -Vector<String8> getNfcAidCategories(AssetManager& assets, String8 xmlPath, bool offHost, +Vector<String8> getNfcAidCategories(AssetManager& assets, const String8& xmlPath, bool offHost, String8 *outError = NULL) { Asset* aidAsset = assets.openNonAsset(xmlPath, Asset::ACCESS_BUFFER); |