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

Merge "Fix false compatibility return status on extension."

Browse Source
This commit is contained in:
Jayant Chowdhary
2018-03-30 03:20:08 +00:00
committed by Gerrit Code Review
parent f8dd4029c1 8be19f1718
commit 63f652ff45
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -105,11 +105,15 @@ HeaderAbiDiff::ExtractUserDefinedTypes(
continue;
}
const abi_util::TypeIR *type = *(odr_list.begin());
const abi_util::RecordTypeIR *record_type = nullptr;
switch (type->GetKind()) {
case abi_util::RecordTypeKind:
record_type = static_cast<const abi_util::RecordTypeIR *>(type);
if (record_type->IsAnonymous()) {
continue;
}
record_types.emplace(
static_cast<const abi_util::RecordTypeIR *>(type)->GetUniqueId(),
static_cast<const abi_util::RecordTypeIR *>(type));
record_type->GetUniqueId(), record_type);
break;
case abi_util::EnumTypeKind:
enum_types.emplace(

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

@@ -183,15 +183,15 @@ int main(int argc, const char **argv) {
<< "******************************************************\n";
}
if ((allow_extensions &&
if (!advice_only && ((!allow_extensions &&
(status & abi_util::CompatibilityStatusIR::Extension)) ||
(allow_unreferenced_changes &&
(!allow_unreferenced_changes &&
(status & abi_util::CompatibilityStatusIR::UnreferencedChanges)) ||
(allow_unreferenced_elf_symbol_changes &&
(!allow_unreferenced_elf_symbol_changes &&
(status & abi_util::CompatibilityStatusIR::ElfIncompatible)) ||
advice_only) {
return abi_util::CompatibilityStatusIR::Compatible;
(status & abi_util::CompatibilityStatusIR::Incompatible))) {
return status;
}
return status;
return abi_util::CompatibilityStatusIR::Compatible;
}