commit 3d8a78a79aaa47be68162cb3e3fb2544f9b624a3
author Nicolas Geoffray <ngeoffray@google.com> Wed Aug 29 21:10:16 2018 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Thu Aug 30 13:37:02 2018 +0100
tree 0f9790f629c798f5c371e75ae20af60fa39a3203
parent c497fca9aa25a331af6428aa0fb6b083c6292089

Revert "Revert "Remove OatFileAssistant::MakeUpToDate and friends.""

This reverts commit baf3761013a30b8c5dc1d6179cddaeee0a764311.

Also remove the now deprecated --{no-}dex2oat option.

Change-Id: I502c7011877f43f315abffa9b7d482ef13857125
bug: 111174995
bug: 111342996

runtime/gc/space/image_space_test.cc

diff --git a/runtime/gc/space/image_space_test.cc b/runtime/gc/space/image_space_test.cc
index d93385d..347af4e 100644
--- a/runtime/gc/space/image_space_test.cc
+++ b/runtime/gc/space/image_space_test.cc
@@ -41,7 +41,7 @@
   args.push_back("--dex-file=" + multidex1);
   args.push_back("--dex-file=" + dex2);
   args.push_back("--oat-file=" + oat_location);
-  ASSERT_TRUE(OatFileAssistant::Dex2Oat(args, &error_msg)) << error_msg;
+  ASSERT_TRUE(Dex2Oat(args, &error_msg)) << error_msg;
 
   std::unique_ptr<OatFile> oat(OatFile::Open(/* zip_fd */ -1,
                                              oat_location.c_str(),