commit 4d6b54eb025ba37f61785538be367f04bd18a13b
author Steven Moreland <smoreland@google.com> Tue Feb 19 18:41:56 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 19 18:41:56 2019 +0000
tree a97c2df2012fb367becaf761ad91ca026d9beec9
parent c4df59656119c04c1c8b7c73e76d7912633baeac
parent 95779c95be0038215f41e0e4ffafa19b75474af7

Merge "Disallow duplicated classes on boot classpath."

tools/hiddenapi/hiddenapi.cc

diff --git a/tools/hiddenapi/hiddenapi.cc b/tools/hiddenapi/hiddenapi.cc
index d810a64..3390a99 100644
--- a/tools/hiddenapi/hiddenapi.cc
+++ b/tools/hiddenapi/hiddenapi.cc
@@ -131,24 +131,12 @@
 
   inline bool Equals(const DexClass& other) const {
     bool equals = strcmp(GetDescriptor(), other.GetDescriptor()) == 0;
+
     if (equals) {
-      // TODO(dbrazdil): Check that methods/fields match as well once b/111116543 is fixed.
-      CHECK_EQ(GetAccessFlags(), other.GetAccessFlags())
-          << "Inconsistent access flags of class " << GetDescriptor() << ": "
-          << "0x" << std::hex << GetAccessFlags() << std::dec << " (" << dex_file_.GetLocation()
-          << ") and 0x" << std::hex << other.GetAccessFlags() << std::dec << " ("
-          << other.dex_file_.GetLocation() << ")";
-      CHECK_EQ(GetSuperclassDescriptor(), other.GetSuperclassDescriptor())
-          << "Inconsistent superclass of class " << GetDescriptor() << ": "
-          << GetSuperclassDescriptor() << " (" << dex_file_.GetLocation()
-          << ") and " << other.GetSuperclassDescriptor() << " (" << other.dex_file_.GetLocation()
-          << ")";
-      CHECK(GetInterfaceDescriptors() == other.GetInterfaceDescriptors())
-          << "Inconsistent set of interfaces of class " << GetDescriptor() << ": "
-          << JoinStringSet(GetInterfaceDescriptors()) << " (" << dex_file_.GetLocation()
-          << ") and " << JoinStringSet(other.GetInterfaceDescriptors()) << " ("
-          << other.dex_file_.GetLocation() << ")";
+      LOG(FATAL) << "Class duplication: " << GetDescriptor() << " in " << dex_file_.GetLocation()
+          << " and " << other.dex_file_.GetLocation();
     }
+
     return equals;
   }