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

header-abi-diff: Fix return code for extension in presence of elf only changes.

Browse Source 
Before this change, an elf symbol change not exported through public
headers would short circuit the check for api extension. As a result,
header-abi-diff would return a compatible return status (0). This isn't
correct, extensions should take precedence over elf only changes and an
extension status should be returned (non zero).

Bug: 79928919

Test: tests/test.py

Merged-In: I6907d0ebaf332d019cdf2e264316f7d521e00d82
Change-Id: I6907d0ebaf332d019cdf2e264316f7d521e00d82
(cherry picked from commit 03c4e279a8)
This commit is contained in:
Jayant Chowdhary
2018-05-23 17:18:23 -07:00
parent a59429db8e
commit 76835eaac4
5 changed files with 51 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
vndk/tools/header-checker/header-abi-util/src/ir_representation_protobuf.cpp
View File

@@ -1179,11 +1179,6 @@ CompatibilityStatusIR ProtobufIRDiffDumper::GetCompatibilityStatusIR() {
return CompatibilityStatusIR::Incompatible;
}
if(diff_tu_->removed_elf_functions().size() != 0 ||
diff_tu_->removed_elf_objects().size() != 0) {
return CompatibilityStatusIR::ElfIncompatible;
}
CompatibilityStatusIR combined_status = CompatibilityStatusIR::Compatible;
if (diff_tu_->enum_type_extension_diffs().size() != 0 ||
@@ -1203,6 +1198,11 @@ CompatibilityStatusIR ProtobufIRDiffDumper::GetCompatibilityStatusIR() {
combined_status | CompatibilityStatusIR::UnreferencedChanges;
}
if(diff_tu_->removed_elf_functions().size() != 0 ||
diff_tu_->removed_elf_objects().size() != 0) {
combined_status = combined_status | CompatibilityStatusIR::ElfIncompatible;
}
return combined_status;
}

9
vndk/tools/header-checker/tests/integration/cpp/gold/low_volume_speaker.cpp
View File

@@ -2,3 +2,12 @@
void LowVolumeSpeaker::Speak() { }
LISTEN_RETURN_TYPE LowVolumeSpeaker::Listen() { LISTEN_RETURN_STATEMENT }
#ifdef ADD_UNEXPORTED_ELF_SYMBOL
void UnexportedSymbol(int *a) {
if (a) {
a++;
}
a--;
}
#endif

20
vndk/tools/header-checker/tests/integration/cpp/gold/map_add_function_elf_symbol.txt Normal file
View File

@@ -0,0 +1,20 @@
libcpp_golden_added_function {
global:
_Z26test_virtual_function_callP12SuperSpeaker;
_ZN12SuperSpeaker11SpeakLouderEv;
_ZN12SuperSpeaker18CreateSuperSpeakerEi;
_ZN12SuperSpeaker9SpeakLoudEv;
_ZN12SuperSpeakerD2Ev;
_ZN16LowVolumeSpeaker5SpeakEv;
_ZN16LowVolumeSpeaker6ListenEv;
_ZN16LowVolumeSpeakerD0Ev;
_ZN17HighVolumeSpeaker11BadPracticeEf;
_ZN17HighVolumeSpeaker13AddedFunctionEv;
_ZN17HighVolumeSpeaker5SpeakEv;
_ZN17HighVolumeSpeaker6ListenEv;
_ZN17HighVolumeSpeakerD0Ev;
_ZN12NotReferenced;
_ZN16UnexportedSymbol;
_ZTV16LowVolumeSpeaker; #var
_ZTV17HighVolumeSpeaker; #var
};

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

@@ -183,6 +183,18 @@ TEST_MODULES = [
arch = '',
api = 'current',
),
Module(
name = 'libgolden_cpp_add_function_and_unexported_elf',
srcs = ['integration/cpp/gold/golden_1.cpp',
'integration/cpp/gold/high_volume_speaker.cpp',
'integration/cpp/gold/low_volume_speaker.cpp',
],
version_script = 'integration/cpp/gold/map_add_function.txt',
export_include_dirs = ['integration/cpp/gold/include'],
cflags = ['-DGOLDEN_ADD_FUNCTION=1', '-DADD_UNEXPORTED_ELF_SYMBOL'],
arch = '',
api = 'current',
),
Module(
name = 'libgolden_cpp_change_function_access',
srcs = ['integration/cpp/gold/golden_1.cpp',

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

@@ -159,6 +159,11 @@ class MyTest(unittest.TestCase):
self.prepare_and_run_abi_diff_all_archs(
"libgolden_cpp", "libgolden_cpp_add_function", 4)
def test_libgolden_cpp_add_function_and_elf_symbol(self):
self.prepare_and_run_abi_diff_all_archs(
"libgolden_cpp", "libgolden_cpp_add_function_and_unexported_elf",
4)
def test_libgolden_cpp_change_function_access(self):
self.prepare_and_run_abi_diff_all_archs(
"libgolden_cpp", "libgolden_cpp_change_function_access", 8)