From 30f2f053f27731e091923a162b91439ee667944f Mon Sep 17 00:00:00 2001 From: Luke Huang Date: Thu, 30 Jul 2020 15:09:18 +0800 Subject: 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 --- linker/linker_namespaces.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'linker/linker_namespaces.cpp') diff --git a/linker/linker_namespaces.cpp b/linker/linker_namespaces.cpp index b9936891d..518212971 100644 --- a/linker/linker_namespaces.cpp +++ b/linker/linker_namespaces.cpp @@ -39,10 +39,9 @@ bool android_namespace_t::is_accessible(const std::string& file) { return true; } - if (!whitelisted_libs_.empty()) { + if (!allowed_libs_.empty()) { const char *lib_name = basename(file.c_str()); - if (std::find(whitelisted_libs_.begin(), whitelisted_libs_.end(), - lib_name) == whitelisted_libs_.end()) { + if (std::find(allowed_libs_.begin(), allowed_libs_.end(), lib_name) == allowed_libs_.end()) { return false; } } -- cgit v1.2.3