Remove DiffStatus::opaque_diff
Since the helper function can compare the opaque types' unique IDs, it
is not necessary to return opaque_diff and compare the reference types'
names.
Test: ./test.py
Bug: 255702405
Change-Id: I1264b0f4d0db178a3dc2202a265c5ccb38df7dc2
diff --git a/vndk/tools/header-checker/src/repr/abi_diff_helpers.cpp b/vndk/tools/header-checker/src/repr/abi_diff_helpers.cpp
index 26586dd..dc94667 100644
--- a/vndk/tools/header-checker/src/repr/abi_diff_helpers.cpp
+++ b/vndk/tools/header-checker/src/repr/abi_diff_helpers.cpp
@@ -842,7 +842,7 @@
// One of the types were hidden, we cannot compare further.
return AreOpaqueTypesEqual(old_type_id, new_type_id)
? DiffStatus::no_diff
- : DiffStatus::opaque_diff;
+ : DiffStatus::direct_diff;
}
LinkableMessageKind old_kind = old_it->second->GetKind();
@@ -856,16 +856,6 @@
}
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;
}
diff --git a/vndk/tools/header-checker/src/repr/abi_diff_helpers.h b/vndk/tools/header-checker/src/repr/abi_diff_helpers.h
index b4d28bd..531b2eb 100644
--- a/vndk/tools/header-checker/src/repr/abi_diff_helpers.h
+++ b/vndk/tools/header-checker/src/repr/abi_diff_helpers.h
@@ -38,8 +38,6 @@
// 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.
indirect_diff = 2,
-
- opaque_diff = 3,
};
static inline DiffStatus operator|(DiffStatus f, DiffStatus s) {
