diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2016-08-12 19:35:08 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-08-12 19:35:08 +0000 |
| commit | 84717d4118cff0790aecd8365029200e36a47bba (patch) | |
| tree | 341d9323e8ab24bf4809d6dc6cacec723b8d9d2a /tools/aapt/Command.cpp | |
| parent | 2de53cbfae1dd609d6f9561eef8423c4ee811121 (diff) | |
| parent | c76aa692075acfef74349185d86062bbfec5a8c0 (diff) | |
resolve merge conflicts of 17bd236 to stage-aosp-master am: b3d46b44a3
am: c76aa69207
Change-Id: I6bb066d131dde297612c5dcbf5051f4964e62a8b
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 59da467a1cc3..42b752d98baa 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); |