linker: Cleanup for Android's inclusive language guidance
1. Cleanup for #inclusivefixit. (whitelisted -> allowed_libs)
2. Support the old term for backwards compatibility. (Also update test.)
3. Fix the formatting errors found by clang-format.
See https://source.android.com/setup/contribute/respectful-code
for reference.
Bug: 161896447
Test: atest linker-unit-tests linker-benchmarks
Change-Id: I19dbed27a6d874ac0049cb7b67d2cb0f75369c1b
diff --git a/linker/linker_config.h b/linker/linker_config.h
index 6733148..fe23ec1 100644
--- a/linker/linker_config.h
+++ b/linker/linker_config.h
@@ -98,9 +98,7 @@
return permitted_paths_;
}
- const std::vector<std::string>& whitelisted_libs() const {
- return whitelisted_libs_;
- }
+ const std::vector<std::string>& allowed_libs() const { return allowed_libs_; }
const std::vector<NamespaceLinkConfig>& links() const {
return namespace_links_;
@@ -127,16 +125,17 @@
permitted_paths_ = std::move(permitted_paths);
}
- void set_whitelisted_libs(std::vector<std::string>&& whitelisted_libs) {
- whitelisted_libs_ = std::move(whitelisted_libs);
+ void set_allowed_libs(std::vector<std::string>&& allowed_libs) {
+ allowed_libs_ = std::move(allowed_libs);
}
+
private:
const std::string name_;
bool isolated_;
bool visible_;
std::vector<std::string> search_paths_;
std::vector<std::string> permitted_paths_;
- std::vector<std::string> whitelisted_libs_;
+ std::vector<std::string> allowed_libs_;
std::vector<NamespaceLinkConfig> namespace_links_;
DISALLOW_IMPLICIT_CONSTRUCTORS(NamespaceConfig);