Merge "Remove libjavacrypto from Runtime APEX as not required."
diff --git a/runtime/Android.bp b/runtime/Android.bp
index b89eb02..a3081e9 100644
--- a/runtime/Android.bp
+++ b/runtime/Android.bp
@@ -396,8 +396,10 @@
"libnativeloader",
"libbacktrace",
"liblog",
- // For atrace, properties, ashmem, set_sched_policy.
+ // For atrace, properties, ashmem.
"libcutils",
+ // For set_sched_policy.
+ "libprocessgroup",
// For common macros.
"libbase",
],
diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index a86bc94..feade83 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -1752,7 +1752,8 @@
// libcore can't because it's the library that implements System.loadLibrary!
{
std::string error_msg;
- if (!java_vm_->LoadNativeLibrary(env, "libjavacore.so", nullptr, nullptr, &error_msg)) {
+ if (!java_vm_->LoadNativeLibrary(
+ env, "libjavacore.so", nullptr, WellKnownClasses::java_lang_Object, &error_msg)) {
LOG(FATAL) << "LoadNativeLibrary failed for \"libjavacore.so\": " << error_msg;
}
}
@@ -1761,7 +1762,8 @@
? "libopenjdkd.so"
: "libopenjdk.so";
std::string error_msg;
- if (!java_vm_->LoadNativeLibrary(env, kOpenJdkLibrary, nullptr, nullptr, &error_msg)) {
+ if (!java_vm_->LoadNativeLibrary(
+ env, kOpenJdkLibrary, nullptr, WellKnownClasses::java_lang_Object, &error_msg)) {
LOG(FATAL) << "LoadNativeLibrary failed for \"" << kOpenJdkLibrary << "\": " << error_msg;
}
}
diff --git a/runtime/thread_android.cc b/runtime/thread_android.cc
index 8ff6c52..24864f9 100644
--- a/runtime/thread_android.cc
+++ b/runtime/thread_android.cc
@@ -21,7 +21,7 @@
#include <sys/resource.h>
#include <sys/time.h>
-#include <cutils/sched_policy.h>
+#include <processgroup/sched_policy.h>
#include <utils/threads.h>
#include "base/macros.h"