AAPT2: Remove usage of u16string
For legacy reasons, we kept around the use of UTF-16 internally
in AAPT2. We don't need this and this CL removes all instances of
std::u16string and StringPiece16. The only places still needed
are when interacting with the ResTable APIs that only operate in
UTF16.
Change-Id: I492475b84bb9014fa13bf992cff447ee7a5fe588
diff --git a/tools/aapt2/test/Builders.h b/tools/aapt2/test/Builders.h
index fb1d8f8..c0c0160 100644
--- a/tools/aapt2/test/Builders.h
+++ b/tools/aapt2/test/Builders.h
@@ -40,81 +40,81 @@
return &mTable->stringPool;
}
- ResourceTableBuilder& setPackageId(const StringPiece16& packageName, uint8_t id) {
+ ResourceTableBuilder& setPackageId(const StringPiece& packageName, uint8_t id) {
ResourceTablePackage* package = mTable->createPackage(packageName, id);
assert(package);
return *this;
}
- ResourceTableBuilder& addSimple(const StringPiece16& name, const ResourceId id = {}) {
+ ResourceTableBuilder& addSimple(const StringPiece& name, const ResourceId id = {}) {
return addValue(name, id, util::make_unique<Id>());
}
- ResourceTableBuilder& addSimple(const StringPiece16& name, const ConfigDescription& config,
+ ResourceTableBuilder& addSimple(const StringPiece& name, const ConfigDescription& config,
const ResourceId id = {}) {
return addValue(name, config, id, util::make_unique<Id>());
}
- ResourceTableBuilder& addReference(const StringPiece16& name, const StringPiece16& ref) {
+ ResourceTableBuilder& addReference(const StringPiece& name, const StringPiece& ref) {
return addReference(name, {}, ref);
}
- ResourceTableBuilder& addReference(const StringPiece16& name, const ResourceId id,
- const StringPiece16& ref) {
+ ResourceTableBuilder& addReference(const StringPiece& name, const ResourceId id,
+ const StringPiece& ref) {
return addValue(name, id, util::make_unique<Reference>(parseNameOrDie(ref)));
}
- ResourceTableBuilder& addString(const StringPiece16& name, const StringPiece16& str) {
+ ResourceTableBuilder& addString(const StringPiece& name, const StringPiece& str) {
return addString(name, {}, str);
}
- ResourceTableBuilder& addString(const StringPiece16& name, const ResourceId id,
- const StringPiece16& str) {
+ ResourceTableBuilder& addString(const StringPiece& name, const ResourceId id,
+ const StringPiece& str) {
return addValue(name, id, util::make_unique<String>(mTable->stringPool.makeRef(str)));
}
- ResourceTableBuilder& addString(const StringPiece16& name, const ResourceId id,
- const ConfigDescription& config, const StringPiece16& str) {
+ ResourceTableBuilder& addString(const StringPiece& name, const ResourceId id,
+ const ConfigDescription& config, const StringPiece& str) {
return addValue(name, config, id,
util::make_unique<String>(mTable->stringPool.makeRef(str)));
}
- ResourceTableBuilder& addFileReference(const StringPiece16& name, const StringPiece16& path) {
+ ResourceTableBuilder& addFileReference(const StringPiece& name, const StringPiece& path) {
return addFileReference(name, {}, path);
}
- ResourceTableBuilder& addFileReference(const StringPiece16& name, const ResourceId id,
- const StringPiece16& path) {
+ ResourceTableBuilder& addFileReference(const StringPiece& name, const ResourceId id,
+ const StringPiece& path) {
return addValue(name, id,
util::make_unique<FileReference>(mTable->stringPool.makeRef(path)));
}
- ResourceTableBuilder& addFileReference(const StringPiece16& name, const StringPiece16& path,
+ ResourceTableBuilder& addFileReference(const StringPiece& name, const StringPiece& path,
const ConfigDescription& config) {
return addValue(name, config, {},
util::make_unique<FileReference>(mTable->stringPool.makeRef(path)));
}
- ResourceTableBuilder& addValue(const StringPiece16& name,
+ ResourceTableBuilder& addValue(const StringPiece& name,
std::unique_ptr<Value> value) {
return addValue(name, {}, std::move(value));
}
- ResourceTableBuilder& addValue(const StringPiece16& name, const ResourceId id,
+ ResourceTableBuilder& addValue(const StringPiece& name, const ResourceId id,
std::unique_ptr<Value> value) {
return addValue(name, {}, id, std::move(value));
}
- ResourceTableBuilder& addValue(const StringPiece16& name, const ConfigDescription& config,
+ ResourceTableBuilder& addValue(const StringPiece& name, const ConfigDescription& config,
const ResourceId id, std::unique_ptr<Value> value) {
ResourceName resName = parseNameOrDie(name);
- bool result = mTable->addResourceAllowMangled(resName, id, config, std::string(),
+ bool result = mTable->addResourceAllowMangled(resName, id, config, {},
std::move(value), &mDiagnostics);
assert(result);
return *this;
}
- ResourceTableBuilder& setSymbolState(const StringPiece16& name, ResourceId id,
+ ResourceTableBuilder& setSymbolState(const StringPiece& name, ResourceId id,
SymbolState state) {
ResourceName resName = parseNameOrDie(name);
Symbol symbol;
@@ -129,7 +129,7 @@
}
};
-inline std::unique_ptr<Reference> buildReference(const StringPiece16& ref,
+inline std::unique_ptr<Reference> buildReference(const StringPiece& ref,
Maybe<ResourceId> id = {}) {
std::unique_ptr<Reference> reference = util::make_unique<Reference>(parseNameOrDie(ref));
reference->id = id;
@@ -160,7 +160,7 @@
return *this;
}
- ValueBuilder& setComment(const StringPiece16& str) {
+ ValueBuilder& setComment(const StringPiece& str) {
mValue->setComment(str);
return *this;
}
@@ -184,9 +184,9 @@
return *this;
}
- AttributeBuilder& addItem(const StringPiece16& name, uint32_t value) {
+ AttributeBuilder& addItem(const StringPiece& name, uint32_t value) {
mAttr->symbols.push_back(Attribute::Symbol{
- Reference(ResourceName{ {}, ResourceType::kId, name.toString()}),
+ Reference(ResourceName({}, ResourceType::kId, name)),
value});
return *this;
}
@@ -201,17 +201,17 @@
std::unique_ptr<Style> mStyle = util::make_unique<Style>();
public:
- StyleBuilder& setParent(const StringPiece16& str) {
+ StyleBuilder& setParent(const StringPiece& str) {
mStyle->parent = Reference(parseNameOrDie(str));
return *this;
}
- StyleBuilder& addItem(const StringPiece16& str, std::unique_ptr<Item> value) {
+ StyleBuilder& addItem(const StringPiece& str, std::unique_ptr<Item> value) {
mStyle->entries.push_back(Style::Entry{ Reference(parseNameOrDie(str)), std::move(value) });
return *this;
}
- StyleBuilder& addItem(const StringPiece16& str, ResourceId id, std::unique_ptr<Item> value) {
+ StyleBuilder& addItem(const StringPiece& str, ResourceId id, std::unique_ptr<Item> value) {
addItem(str, std::move(value));
mStyle->entries.back().key.id = id;
return *this;
@@ -227,7 +227,7 @@
std::unique_ptr<Styleable> mStyleable = util::make_unique<Styleable>();
public:
- StyleableBuilder& addItem(const StringPiece16& str, Maybe<ResourceId> id = {}) {
+ StyleableBuilder& addItem(const StringPiece& str, Maybe<ResourceId> id = {}) {
mStyleable->entries.push_back(Reference(parseNameOrDie(str)));
mStyleable->entries.back().id = id;
return *this;
diff --git a/tools/aapt2/test/Common.h b/tools/aapt2/test/Common.h
index faccd477..b2eaba6 100644
--- a/tools/aapt2/test/Common.h
+++ b/tools/aapt2/test/Common.h
@@ -62,7 +62,7 @@
return &diag;
}
-inline ResourceName parseNameOrDie(const StringPiece16& str) {
+inline ResourceName parseNameOrDie(const StringPiece& str) {
ResourceNameRef ref;
bool result = ResourceUtils::tryParseReference(str, &ref);
assert(result && "invalid resource name");
@@ -77,7 +77,7 @@
}
template <typename T> T* getValueForConfigAndProduct(ResourceTable* table,
- const StringPiece16& resName,
+ const StringPiece& resName,
const ConfigDescription& config,
const StringPiece& product) {
Maybe<ResourceTable::SearchResult> result = table->findResource(parseNameOrDie(resName));
@@ -90,12 +90,12 @@
return nullptr;
}
-template <typename T> T* getValueForConfig(ResourceTable* table, const StringPiece16& resName,
+template <typename T> T* getValueForConfig(ResourceTable* table, const StringPiece& resName,
const ConfigDescription& config) {
return getValueForConfigAndProduct<T>(table, resName, config, {});
}
-template <typename T> T* getValue(ResourceTable* table, const StringPiece16& resName) {
+template <typename T> T* getValue(ResourceTable* table, const StringPiece& resName) {
return getValueForConfig<T>(table, resName, {});
}
diff --git a/tools/aapt2/test/Context.h b/tools/aapt2/test/Context.h
index 36f568b..b053e07 100644
--- a/tools/aapt2/test/Context.h
+++ b/tools/aapt2/test/Context.h
@@ -19,7 +19,6 @@
#include "NameMangler.h"
#include "util/Util.h"
-
#include "process/IResourceTableConsumer.h"
#include "process/SymbolTable.h"
#include "test/Common.h"
@@ -40,7 +39,7 @@
return &mDiagnostics;
}
- const std::u16string& getCompilationPackage() override {
+ const std::string& getCompilationPackage() override {
assert(mCompilationPackage && "package name not set");
return mCompilationPackage.value();
}
@@ -65,7 +64,7 @@
private:
friend class ContextBuilder;
- Maybe<std::u16string> mCompilationPackage;
+ Maybe<std::string> mCompilationPackage;
Maybe<uint8_t> mPackageId;
StdErrDiagnostics mDiagnostics;
SymbolTable mSymbols;
@@ -78,7 +77,7 @@
std::unique_ptr<Context> mContext = std::unique_ptr<Context>(new Context());
public:
- ContextBuilder& setCompilationPackage(const StringPiece16& package) {
+ ContextBuilder& setCompilationPackage(const StringPiece& package) {
mContext->mCompilationPackage = package.toString();
return *this;
}
@@ -110,7 +109,7 @@
class StaticSymbolSourceBuilder {
public:
- StaticSymbolSourceBuilder& addPublicSymbol(const StringPiece16& name, ResourceId id,
+ StaticSymbolSourceBuilder& addPublicSymbol(const StringPiece& name, ResourceId id,
std::unique_ptr<Attribute> attr = {}) {
std::unique_ptr<SymbolTable::Symbol> symbol = util::make_unique<SymbolTable::Symbol>(
id, std::move(attr), true);
@@ -120,7 +119,7 @@
return *this;
}
- StaticSymbolSourceBuilder& addSymbol(const StringPiece16& name, ResourceId id,
+ StaticSymbolSourceBuilder& addSymbol(const StringPiece& name, ResourceId id,
std::unique_ptr<Attribute> attr = {}) {
std::unique_ptr<SymbolTable::Symbol> symbol = util::make_unique<SymbolTable::Symbol>(
id, std::move(attr), false);