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_test.cpp b/linker/linker_config_test.cpp
index 3caa4d4..acdf641 100644
--- a/linker/linker_config_test.cpp
+++ b/linker/linker_config_test.cpp
@@ -91,6 +91,8 @@
"namespace.vndk_in_system.permitted.paths = /system/${LIB}\n"
"namespace.vndk_in_system.whitelisted = libz.so:libyuv.so\n"
"namespace.vndk_in_system.whitelisted += libtinyxml2.so\n"
+ "namespace.vndk_in_system.allowed_libs = libfoo.so:libbar.so\n"
+ "namespace.vndk_in_system.allowed_libs += libtinyxml3.so\n"
"\n";
// clang-format on
@@ -215,9 +217,9 @@
ASSERT_TRUE(ns_vndk_links[0].allow_all_shared_libs());
ASSERT_TRUE(ns_vndk_in_system != nullptr) << "vndk_in_system namespace was not found";
- ASSERT_EQ(
- std::vector<std::string>({"libz.so", "libyuv.so", "libtinyxml2.so"}),
- ns_vndk_in_system->whitelisted_libs());
+ ASSERT_EQ(std::vector<std::string>({"libz.so", "libyuv.so", "libtinyxml2.so", "libfoo.so",
+ "libbar.so", "libtinyxml3.so"}),
+ ns_vndk_in_system->allowed_libs());
}
TEST(linker_config, smoke) {