tree b55804542510f8592c1c5b9e522a16d35567b2f1
parent 54c42cea2b73e664c36fc4efaa28a33aea39b97c
author Mathieu Chartier <mathieuc@google.com> 1526068986 -0700
committer Mathieu Chartier <mathieuc@google.com> 1526069140 -0700

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