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

Merge "Remove DiffStatus::opaque_diff"

Browse Source
This commit is contained in:
Hsin-Yi Chen
2022-12-06 07:42:04 +00:00
committed by Gerrit Code Review
parent 92c1be2a08 e14853c82d
commit 0bfb1a674b
2 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
vndk/tools/header-checker/src/repr/abi_diff_helpers.cpp
View File

@@ -842,7 +842,7 @@ DiffStatus AbiDiffHelper::CompareAndDumpTypeDiff(
// One of the types were hidden, we cannot compare further. // One of the types were hidden, we cannot compare further.
return AreOpaqueTypesEqual(old_type_id, new_type_id) return AreOpaqueTypesEqual(old_type_id, new_type_id)
? DiffStatus::no_diff ? DiffStatus::no_diff
: DiffStatus::opaque_diff; : DiffStatus::direct_diff;
} }
LinkableMessageKind old_kind = old_it->second->GetKind(); LinkableMessageKind old_kind = old_it->second->GetKind();
@@ -856,16 +856,6 @@ DiffStatus AbiDiffHelper::CompareAndDumpTypeDiff(
} }
TypeQueueCheckAndPop(type_queue); TypeQueueCheckAndPop(type_queue);
if (diff_policy_options_.consider_opaque_types_different_ &&
diff_status == DiffStatus::opaque_diff) {
// If `-considered-opaque-types-different` is specified and the comparison
// of `referenced_type` results in `opaque_diff`, then check the type name
// at this level.
return (old_it->second->GetName() == new_it->second->GetName() ?
DiffStatus::no_diff : DiffStatus::direct_diff);
}
return diff_status; return diff_status;
} }

2
vndk/tools/header-checker/src/repr/abi_diff_helpers.h
View File

@@ -38,8 +38,6 @@ enum DiffStatus {
// There was a diff found, however it need not be added as a part of a diff // There was a diff found, however it need not be added as a part of a diff
// message, since it would have already been noted elsewhere. // message, since it would have already been noted elsewhere.
indirect_diff = 2, indirect_diff = 2,
opaque_diff = 3,
}; };
static inline DiffStatus operator|(DiffStatus f, DiffStatus s) { static inline DiffStatus operator|(DiffStatus f, DiffStatus s) {