commit 46cc64f11b1b1f0ac5e4aebd665b325a68d4d42f
author Richard Uhler <ruhler@google.com> Mon Nov 14 14:53:55 2016 +0000
committer Richard Uhler <ruhler@google.com> Thu Nov 24 07:54:03 2016 +0000
tree 182f28f92fb576b2ad586a368ac2d0761896e832
parent 3e580bc9b248586fa5d87db2098fa5c5abb7afc1

Move dumping of oat file status inside of the OatFileAssistant.

Rather than exposing what could otherwise be internal to the
OatFileAssistant, move the logic for dumping a human readable
representation of the status of the oat files inside the
OatFileAssistant.

Bug: 30937355
Test: oat_file_assistant_test

Change-Id: I79c6cc1286a822f1dbe0035be934a2be4792563c

runtime/oat_file_assistant.h

diff --git a/runtime/oat_file_assistant.h b/runtime/oat_file_assistant.h
index 825a16c..2369ed0 100644
--- a/runtime/oat_file_assistant.h
+++ b/runtime/oat_file_assistant.h
@@ -179,6 +179,10 @@
   // the OatFileAssistant object.
   std::unique_ptr<OatFile> GetBestOatFile();
 
+  // Returns a human readable description of the status of the code for the
+  // dex file. The returned description is for debugging purposes only.
+  std::string GetStatusDump();
+
   // Open and returns an image space associated with the oat file.
   static std::unique_ptr<gc::space::ImageSpace> OpenImageSpace(const OatFile* oat_file);
 
@@ -207,31 +211,16 @@
   // ASLR. The odex file is treated as if it were read-only.
   // These methods return the location and status of the odex file for the dex
   // location.
-  // Notes:
-  //  * OdexFileName may return null if the odex file name could not be
-  //    determined.
-  const std::string* OdexFileName();
   bool OdexFileExists();
   OatStatus OdexFileStatus();
-  // Must only be called if the associated odex file exists, i.e, if
-  // |OdexFileExists() == true|.
-  CompilerFilter::Filter OdexFileCompilerFilter();
 
   // When the dex files is compiled on the target device, the oat file is the
   // result. The oat file will have been relocated to some
   // (possibly-out-of-date) offset for ASLR.
   // These methods return the location and status of the target oat file for
   // the dex location.
-  //
-  // Notes:
-  //  * OatFileName may return null if the oat file name could not be
-  //    determined.
-  const std::string* OatFileName();
   bool OatFileExists();
   OatStatus OatFileStatus();
-  // Must only be called if the associated oat file exists, i.e, if
-  // |OatFileExists() == true|.
-  CompilerFilter::Filter OatFileCompilerFilter();
 
   // Return the status for a given opened oat file with respect to the dex
   // location.