commit 76f5cb6026b9c83bf00fd1007703503a327f704d
author Richard Uhler <ruhler@google.com> Mon Apr 04 13:30:16 2016 -0700
committer Richard Uhler <ruhler@google.com> Wed Apr 13 13:03:45 2016 -0700
tree cab074443f474275a784957585130201b5138ee4
parent d27fd40d5353141660c033156492efd639c4d048

Restore fallback behavior in the no-image stripped-dex case.

Add --strip-dex option to run-test to test this case.

Bug: 27599626
Change-Id: I010543f48c39adbda007e2e05dda62ac1d70715c

runtime/oat_file_manager.cc

diff --git a/runtime/oat_file_manager.cc b/runtime/oat_file_manager.cc
index 94f6345..3846605 100644
--- a/runtime/oat_file_manager.cc
+++ b/runtime/oat_file_manager.cc
@@ -364,7 +364,7 @@
 
       // However, if the app was part of /system and preopted, there is no original dex file
       // available. In that case grudgingly accept the oat file.
-      if (!DexFile::MaybeDex(dex_location)) {
+      if (!oat_file_assistant.HasOriginalDexFiles()) {
         accept_oat_file = true;
         LOG(WARNING) << "Dex location " << dex_location << " does not seem to include dex file. "
                      << "Allow oat file use. This is potentially dangerous.";