diff options
| author | Luke Huang <huangluke@google.com> | 2020-07-30 15:09:18 +0800 |
|---|---|---|
| committer | Luke Huang <huangluke@google.com> | 2020-07-31 11:37:28 +0800 |
| commit | 30f2f053f27731e091923a162b91439ee667944f (patch) | |
| tree | 76a39c25edba4620568081de4224a60a3ce6debb /linker/linker_config_test.cpp | |
| parent | 3025f128f3cdeb168a915cb51af84c4dac841e4a (diff) | |
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
Diffstat (limited to 'linker/linker_config_test.cpp')
| -rw-r--r-- | linker/linker_config_test.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/linker/linker_config_test.cpp b/linker/linker_config_test.cpp index 3caa4d47f..acdf64173 100644 --- a/linker/linker_config_test.cpp +++ b/linker/linker_config_test.cpp @@ -91,6 +91,8 @@ static const char* config_str = "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 @@ static void run_linker_config_smoke_test(bool is_asan) { 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) { |