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

header-abi-diff: Fix omission of warning message for extensions.

Browse Source 
Test: Without change : extend libjpeg; build breaks without warning message
      specifying extension

Test: With change : extend libjpeg; build breaks with warning message specifying
      extension

Test: tests/test.py

Change-Id: I1653a977d0945810b4b9dc4ec9923b12c4f5dc36
This commit is contained in:
Jayant Chowdhary
2018-05-24 15:58:49 -07:00
parent 03c4e279a8
commit b31dbb37f6
3 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
vndk/tools/header-checker/header-abi-diff/src/header_abi_diff.cpp
View File

@@ -126,6 +126,16 @@ static std::set<std::string> LoadIgnoredSymbols(std::string &symbol_list_path) {
static const char kWarn[] = "\033[36;1mwarning: \033[0m";
static const char kError[] = "\033[31;1merror: \033[0m";
bool ShouldEmitWarningMessage(abi_util::CompatibilityStatusIR status) {
return (!allow_extensions &&
(status & abi_util::CompatibilityStatusIR::Extension)) ||
(!allow_unreferenced_changes &&
(status & abi_util::CompatibilityStatusIR::UnreferencedChanges)) ||
(!allow_unreferenced_elf_symbol_changes &&
(status & abi_util::CompatibilityStatusIR::ElfIncompatible)) ||
(status & abi_util::CompatibilityStatusIR::Incompatible);
}
int main(int argc, const char **argv) {
llvm::cl::ParseCommandLineOptions(argc, argv, "header-checker");
std::set<std::string> ignored_symbols;
@@ -168,15 +178,10 @@ int main(int argc, const char **argv) {
unreferenced_change_str += " This MIGHT be an ABI breaking change due to";
unreferenced_change_str += " internal typecasts.";
}
bool suppress_extending_warnings =
allow_extensions && (status & abi_util::CompatibilityStatusIR::Extension);
bool suppress_elf_warnings =
allow_unreferenced_elf_symbol_changes &&
(status & abi_util::CompatibilityStatusIR::ElfIncompatible);
bool should_emit_warning_message = ShouldEmitWarningMessage(status);
if (!suppress_local_warnings && !suppress_extending_warnings &&
!suppress_elf_warnings && status) {
if (should_emit_warning_message) {
llvm::errs() << "******************************************************\n"
<< error_or_warning_str
<< "VNDK library: "
@@ -189,13 +194,7 @@ int main(int argc, const char **argv) {
<< "******************************************************\n";
}
if (!advice_only && ((!allow_extensions &&
(status & abi_util::CompatibilityStatusIR::Extension)) ||
(!allow_unreferenced_changes &&
(status & abi_util::CompatibilityStatusIR::UnreferencedChanges)) ||
(!allow_unreferenced_elf_symbol_changes &&
(status & abi_util::CompatibilityStatusIR::ElfIncompatible)) ||
(status & abi_util::CompatibilityStatusIR::Incompatible))) {
if (!advice_only && should_emit_warning_message) {
return status;
}