diff --git a/vndk/tools/header-checker/src/diff/abi_diff.cpp b/vndk/tools/header-checker/src/diff/abi_diff.cpp index b8f82f9ce..8a2ccf9d2 100644 --- a/vndk/tools/header-checker/src/diff/abi_diff.cpp +++ b/vndk/tools/header-checker/src/diff/abi_diff.cpp @@ -327,7 +327,9 @@ bool HeaderAbiDiff::DumpLoneElements( for (auto &&element : elements) { if (IgnoreSymbol(element, ignored_symbols_, - [](const T *e) {return e->GetLinkerSetKey();})) { + [](const T *e) {return e->GetLinkerSetKey();}) || + ignored_linker_set_keys_.find(element->GetLinkerSetKey()) != + ignored_linker_set_keys_.end()) { continue; } diff --git a/vndk/tools/header-checker/tests/test.py b/vndk/tools/header-checker/tests/test.py index 9d31d40b5..69fdec59b 100755 --- a/vndk/tools/header-checker/tests/test.py +++ b/vndk/tools/header-checker/tests/test.py @@ -150,7 +150,11 @@ class HeaderCheckerTest(unittest.TestCase): def test_libc_and_cpp_and_libc_and_cpp_with_unused_struct_check_all(self): self.prepare_and_run_abi_diff_all_archs( "libc_and_cpp", "libc_and_cpp_with_unused_struct", 1, - ['-check-all-apis']) + ["-check-all-apis"]) + self.prepare_and_run_abi_diff_all_archs( + "libc_and_cpp", "libc_and_cpp_with_unused_struct", 0, + ["-check-all-apis", + "-ignore-linker-set-key", "_ZTI12UnusedStruct"]) def test_libc_and_cpp_with_unused_struct_and_libc_and_cpp_with_unused_cstruct( self): @@ -227,6 +231,9 @@ class HeaderCheckerTest(unittest.TestCase): def test_libgolden_cpp_member_diff(self): self.prepare_and_run_abi_diff_all_archs( "libgolden_cpp", "libgolden_cpp_member_diff", 8) + self.prepare_and_run_abi_diff_all_archs( + "libgolden_cpp", "libgolden_cpp_member_diff", 0, + ["-ignore-linker-set-key", "_ZTI16LowVolumeSpeaker"]) def test_libgolden_cpp_change_member_access(self): self.prepare_and_run_abi_diff_all_archs( @@ -239,6 +246,9 @@ class HeaderCheckerTest(unittest.TestCase): def test_libgolden_cpp_enum_diff(self): self.prepare_and_run_abi_diff_all_archs( "libgolden_cpp", "libgolden_cpp_enum_diff", 8) + self.prepare_and_run_abi_diff_all_archs( + "libgolden_cpp", "libgolden_cpp_enum_diff", 0, + ["-ignore-linker-set-key", "_ZTIN12SuperSpeaker6VolumeE"]) def test_libgolden_cpp_member_fake_diff(self): self.prepare_and_run_abi_diff_all_archs(