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/Android.bp

diff --git a/test/Android.bp b/test/Android.bp
index 0c6b449..76189f6 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -423,6 +423,7 @@
         "154-gc-loop/heap_interface.cc",
         "167-visit-locks/visit_locks.cc",
         "169-threadgroup-jni/jni_daemon_thread.cc",
+        "172-app-image-twice/debug_print_class.cc",
         "1945-proxy-method-arguments/get_args.cc",
         "203-multi-checkpoint/multi_checkpoint.cc",
         "305-other-fault-handler/fault_handler.cc",