Have JNI FindClass fall back to system ClassLoader
Bug: 10994325
Change-Id: Id0a46e78eecfe8a9eb91008765c4fff48697cc58
diff --git a/runtime/runtime.h b/runtime/runtime.h
index 365d2d8..bc5c8b0 100644
--- a/runtime/runtime.h
+++ b/runtime/runtime.h
@@ -240,6 +240,9 @@
// Returns the "system" ThreadGroup, used when attaching our internal threads.
jobject GetSystemThreadGroup() const;
+ // Returns the system ClassLoader which represents the CLASSPATH.
+ jobject GetSystemClassLoader() const;
+
// Attaches the calling native thread to the runtime.
bool AttachCurrentThread(const char* thread_name, bool as_daemon, jobject thread_group,
bool create_peer);
@@ -467,9 +470,6 @@
mirror::ArtMethod* resolution_method_;
- // As returned by ClassLoader.getSystemClassLoader()
- mirror::ClassLoader* system_class_loader_;
-
// A non-zero value indicates that a thread has been created but not yet initialized. Guarded by
// the shutdown lock so that threads aren't born while we're shutting down.
size_t threads_being_born_ GUARDED_BY(Locks::runtime_shutdown_lock_);
@@ -510,6 +510,9 @@
jobject main_thread_group_;
jobject system_thread_group_;
+ // As returned by ClassLoader.getSystemClassLoader().
+ jobject system_class_loader_;
+
DISALLOW_COPY_AND_ASSIGN(Runtime);
};