Make StringPiece to be std::string_view alias
Bug: 237583012
Test: build + boot + UTs
Change-Id: I849831f4466d3b9c7ec842b75256e7fcba77a0c0
diff --git a/tools/aapt2/NameMangler.h b/tools/aapt2/NameMangler.h
index 0b49052..0b08c32 100644
--- a/tools/aapt2/NameMangler.h
+++ b/tools/aapt2/NameMangler.h
@@ -36,7 +36,7 @@
* We must know which references to mangle, and which to keep (android vs.
* com.android.support).
*/
- std::set<std::string> packages_to_mangle;
+ std::set<std::string, std::less<>> packages_to_mangle;
};
class NameMangler {
@@ -54,7 +54,7 @@
mangled_entry_name);
}
- bool ShouldMangle(const std::string& package) const {
+ bool ShouldMangle(std::string_view package) const {
if (package.empty() || policy_.target_package_name == package) {
return false;
}
@@ -68,8 +68,8 @@
* The mangled name should contain symbols that are illegal to define in XML,
* so that there will never be name mangling collisions.
*/
- static std::string MangleEntry(const std::string& package, const std::string& name) {
- return package + "$" + name;
+ static std::string MangleEntry(std::string_view package, std::string_view name) {
+ return (std::string(package) += '$') += name;
}
/**