diff options
Diffstat (limited to 'tools/aapt2/link/ReferenceLinker.cpp')
| -rw-r--r-- | tools/aapt2/link/ReferenceLinker.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/aapt2/link/ReferenceLinker.cpp b/tools/aapt2/link/ReferenceLinker.cpp index 66eb0df048db..be7aca3ca49f 100644 --- a/tools/aapt2/link/ReferenceLinker.cpp +++ b/tools/aapt2/link/ReferenceLinker.cpp @@ -138,7 +138,7 @@ private: const Attribute* attr) { if (RawString* rawString = valueCast<RawString>(value.get())) { std::unique_ptr<Item> transformed = - ResourceUtils::parseItemForAttribute(*rawString->value, attr); + ResourceUtils::tryParseItemForAttribute(*rawString->value, attr); // If we could not parse as any specific type, try a basic STRING. if (!transformed && (attr->typeMask & android::ResTable_map::TYPE_STRING)) { @@ -231,6 +231,7 @@ Maybe<xml::AaptAttribute> ReferenceLinker::compileXmlAttribute(const Reference& std::string* outError) { const SymbolTable::Symbol* symbol = resolveSymbol(reference, nameMangler, symbols); if (!symbol) { + if (outError) *outError = "not found"; return {}; } @@ -288,7 +289,7 @@ namespace { struct EmptyDeclStack : public xml::IPackageDeclStack { Maybe<xml::ExtractedPackage> transformPackageAlias( - const StringPiece16& alias, const StringPiece16& localPackage) const override { + const StringPiece& alias, const StringPiece& localPackage) const override { if (alias.empty()) { return xml::ExtractedPackage{ localPackage.toString(), true /* private */ }; } |