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_namespaces.h b/linker/linker_namespaces.h index 6843ebc..3c2dc20 100644 --- a/linker/linker_namespaces.h +++ b/linker/linker_namespaces.h
@@ -118,14 +118,12 @@ permitted_paths_ = permitted_paths; } - const std::vector<std::string>& get_whitelisted_libs() const { - return whitelisted_libs_; + const std::vector<std::string>& get_allowed_libs() const { return allowed_libs_; } + void set_allowed_libs(std::vector<std::string>&& allowed_libs) { + allowed_libs_ = std::move(allowed_libs); } - void set_whitelisted_libs(std::vector<std::string>&& whitelisted_libs) { - whitelisted_libs_ = std::move(whitelisted_libs); - } - void set_whitelisted_libs(const std::vector<std::string>& whitelisted_libs) { - whitelisted_libs_ = whitelisted_libs; + void set_allowed_libs(const std::vector<std::string>& allowed_libs) { + allowed_libs_ = allowed_libs; } const std::vector<android_namespace_link_t>& linked_namespaces() const { @@ -176,7 +174,7 @@ std::vector<std::string> ld_library_paths_; std::vector<std::string> default_library_paths_; std::vector<std::string> permitted_paths_; - std::vector<std::string> whitelisted_libs_; + std::vector<std::string> allowed_libs_; // Loader looks into linked namespace if it was not able // to find a library in this namespace. Note that library // lookup in linked namespaces are limited by the list of