commit adc9086aac1f9442f5ec80cec5734909f0b0f262
author Mathieu Chartier <mathieuc@google.com> Fri May 11 13:03:06 2018 -0700
committer Mathieu Chartier <mathieuc@google.com> Fri May 11 13:05:40 2018 -0700
tree b55804542510f8592c1c5b9e522a16d35567b2f1
parent 54c42cea2b73e664c36fc4efaa28a33aea39b97c

Revert "Revert "Do not load app image for class collisions""

Fixed bug in oat file assistant to allow the special shared library
marker.

Bug: 77342775
Bug: 79200502
Bug: 79575750
Test: test-art-host

This reverts commit 2c7e13b120926d3c3c18d649cd9849ea31b81477.

Change-Id: I647f55a07e4aef8bef56fb1ad7ff23056174b135

test/knownfailures.json

diff --git a/test/knownfailures.json b/test/knownfailures.json
index f313758..f473a99 100644
--- a/test/knownfailures.json
+++ b/test/knownfailures.json
@@ -734,6 +734,7 @@
           "164-resolution-trampoline-dex-cache",
           "167-visit-locks",
           "168-vmstack-annotated",
+          "172-app-image-twice",
           "201-built-in-except-detail-messages",
           "203-multi-checkpoint",
           "304-method-tracing",