diff options
| author | Andreas Gampe <agampe@google.com> | 2015-05-21 20:33:40 +0000 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2015-05-21 20:33:40 +0000 |
| commit | 18a1827a159f1b235f3fcc934f428059185f550e (patch) | |
| tree | ed6e7447289f403ee0e6ed83ee216591d2aee4f9 /runtime/class_linker.cc | |
| parent | aafcfca5fe545365ef377fff2897b8a908f03e71 (diff) | |
| download | android_art-18a1827a159f1b235f3fcc934f428059185f550e.tar.gz android_art-18a1827a159f1b235f3fcc934f428059185f550e.tar.bz2 android_art-18a1827a159f1b235f3fcc934f428059185f550e.zip | |
Revert "DO NOT MERGE ART: Turn off duplicate-classes checking"
This reverts commit aafcfca5fe545365ef377fff2897b8a908f03e71.
Bug: 21333911
Change-Id: Ibbc6b1be8bebc1d0ab9c5955b34eb89f40577baa
Diffstat (limited to 'runtime/class_linker.cc')
| -rw-r--r-- | runtime/class_linker.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc index 491c910e0c..292f830764 100644 --- a/runtime/class_linker.cc +++ b/runtime/class_linker.cc @@ -82,9 +82,6 @@ namespace art { static constexpr bool kSanityCheckObjects = kIsDebugBuild; -// For b/21333911. -static constexpr bool kDuplicateClassesCheck = false; - static void ThrowNoClassDefFoundError(const char* fmt, ...) __attribute__((__format__(__printf__, 1, 2))) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); @@ -858,10 +855,6 @@ const OatFile* ClassLinker::GetPrimaryOatFile() { // the two elements agree on whether their dex file was from an already-loaded oat-file or the // new oat file. Any disagreement indicates a collision. bool ClassLinker::HasCollisions(const OatFile* oat_file, std::string* error_msg) { - if (!kDuplicateClassesCheck) { - return false; - } - // Dex files are registered late - once a class is actually being loaded. We have to compare // against the open oat files. Take the dex_lock_ that protects oat_files_ accesses. ReaderMutexLock mu(Thread::Current(), dex_lock_); |