LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Filter added or removed types by -ignore-linker-set-key" am: adc960d590 am: 7995aca67b am: 152264e539

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/development/+/2223129

Change-Id: I9357a1edbb7283b81b48d50086595af6fb2fcbed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hsin-Yi Chen
2022-09-23 05:04:43 +00:00
committed by Automerger Merge Worker
parent 11a43e6311 152264e539
commit 79fa7d3ecf
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vndk/tools/header-checker/src/diff/abi_diff.cpp
View File

@@ -327,7 +327,9 @@ bool HeaderAbiDiff::DumpLoneElements(
for (auto &&element : elements) { for (auto &&element : elements) {
if (IgnoreSymbol<T>(element, ignored_symbols_, if (IgnoreSymbol<T>(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; continue;
} }

12
vndk/tools/header-checker/tests/test.py
View File

@@ -150,7 +150,11 @@ class HeaderCheckerTest(unittest.TestCase):
def test_libc_and_cpp_and_libc_and_cpp_with_unused_struct_check_all(self): def test_libc_and_cpp_and_libc_and_cpp_with_unused_struct_check_all(self):
self.prepare_and_run_abi_diff_all_archs( self.prepare_and_run_abi_diff_all_archs(
"libc_and_cpp", "libc_and_cpp_with_unused_struct", 1, "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( def test_libc_and_cpp_with_unused_struct_and_libc_and_cpp_with_unused_cstruct(
self): self):
@@ -227,6 +231,9 @@ class HeaderCheckerTest(unittest.TestCase):
def test_libgolden_cpp_member_diff(self): def test_libgolden_cpp_member_diff(self):
self.prepare_and_run_abi_diff_all_archs( self.prepare_and_run_abi_diff_all_archs(
"libgolden_cpp", "libgolden_cpp_member_diff", 8) "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): def test_libgolden_cpp_change_member_access(self):
self.prepare_and_run_abi_diff_all_archs( self.prepare_and_run_abi_diff_all_archs(
@@ -239,6 +246,9 @@ class HeaderCheckerTest(unittest.TestCase):
def test_libgolden_cpp_enum_diff(self): def test_libgolden_cpp_enum_diff(self):
self.prepare_and_run_abi_diff_all_archs( self.prepare_and_run_abi_diff_all_archs(
"libgolden_cpp", "libgolden_cpp_enum_diff", 8) "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): def test_libgolden_cpp_member_fake_diff(self):
self.prepare_and_run_abi_diff_all_archs( self.prepare_and_run_abi_diff_all_archs(