Revert "libmojo: Uprev the library to r456626 from Chromium"
This reverts commit 8ac9103e05b66812c25348943383f9365d1ce3e0.
Reason for revert: Broke the mac_sdk
Exempt-From-Owner-Approval: Fixing mac_sdk
Change-Id: I0b74d1abaa66933a93fd6f82ff018e8948c1204e
diff --git a/base/android/java_runtime.cc b/base/android/java_runtime.cc
index 5fae49a..5be9adf 100644
--- a/base/android/java_runtime.cc
+++ b/base/android/java_runtime.cc
@@ -9,12 +9,16 @@
namespace base {
namespace android {
+bool JavaRuntime::Register(JNIEnv* env) {
+ return JNI_Runtime::RegisterNativesImpl(env);
+}
+
void JavaRuntime::GetMemoryUsage(long* total_memory, long* free_memory) {
JNIEnv* env = base::android::AttachCurrentThread();
base::android::ScopedJavaLocalRef<jobject> runtime =
JNI_Runtime::Java_Runtime_getRuntime(env);
- *total_memory = JNI_Runtime::Java_Runtime_totalMemory(env, runtime);
- *free_memory = JNI_Runtime::Java_Runtime_freeMemory(env, runtime);
+ *total_memory = JNI_Runtime::Java_Runtime_totalMemory(env, runtime.obj());
+ *free_memory = JNI_Runtime::Java_Runtime_freeMemory(env, runtime.obj());
}
} // namespace android