commit fbc31087932a65e036a153afab3049dc5298656a
author Mathieu Chartier <mathieuc@google.com> Sun Jan 24 11:59:56 2016 -0800
committer Mathieu Chartier <mathieuc@google.com> Mon Jan 25 14:22:15 2016 -0800
tree c728b9039a71db3be9cae888ad5e1afc31f34a13
parent c7f4e3a5aeaa23342b4e03b0d751f60ac5c5815c

Revert "Revert "Load app images""

This reverts commit 1bc977cf2f8199311a97f2ba9431a184540e3e9c.

Bug: 22858531

Change-Id: Ide00bf3a73a02cba3bb364177204ad1b13f70295

runtime/oat_file_manager.h

diff --git a/runtime/oat_file_manager.h b/runtime/oat_file_manager.h
index 4690e45..c508c4b 100644
--- a/runtime/oat_file_manager.h
+++ b/runtime/oat_file_manager.h
@@ -25,6 +25,7 @@
 
 #include "base/macros.h"
 #include "base/mutex.h"
+#include "jni.h"
 
 namespace art {
 
@@ -101,6 +102,8 @@
   std::vector<std::unique_ptr<const DexFile>> OpenDexFilesFromOat(
       const char* dex_location,
       const char* oat_location,
+      jobject class_loader,
+      jobjectArray dex_elements,
       /*out*/ const OatFile** out_oat_file,
       /*out*/ std::vector<std::string>* error_msgs)
       REQUIRES(!Locks::oat_file_manager_lock_, !Locks::mutator_lock_);