Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(89)

Unified Diff: testing/android/native_test/native_test_jni_onload.cc

Issue 2620303004: Remove JNI onload callback vector construction in favour of direct calls. (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: testing/android/native_test/native_test_jni_onload.cc
diff --git a/testing/android/native_test/native_test_jni_onload.cc b/testing/android/native_test/native_test_jni_onload.cc
index 8fecc444c0ecd306abadfbc323ba02c80aea3269..906358fd97e782c2dc2c7ccc6cf4dd9c3e085fd2 100644
--- a/testing/android/native_test/native_test_jni_onload.cc
+++ b/testing/android/native_test/native_test_jni_onload.cc
@@ -4,16 +4,20 @@
#include "base/android/base_jni_onload.h"
#include "base/android/jni_android.h"
+#include "base/android/library_loader/library_loader_hooks.h"
#include "base/bind.h"
#include "testing/android/native_test/native_test_launcher.h"
namespace {
-bool RegisterJNI(JNIEnv* env) {
- return testing::android::RegisterNativeTestJNI(env);
+bool RegisterJNI() {
+ return testing::android::RegisterNativeTestJNI(
+ base::android::AttachCurrentThread());
}
-bool Init() {
+bool NativeInit() {
+ if (!base::android::OnJNIOnLoadInit())
+ return false;
testing::android::InstallHandlers();
return true;
}
@@ -23,16 +27,9 @@ bool Init() {
// This is called by the VM when the shared library is first loaded.
JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
- std::vector<base::android::RegisterCallback> register_callbacks;
- register_callbacks.push_back(base::Bind(&RegisterJNI));
-
- if (!base::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks))
- return -1;
-
- std::vector<base::android::InitCallback> init_callbacks;
- init_callbacks.push_back(base::Bind(&Init));
- if (!base::android::OnJNIOnLoadInit(init_callbacks))
+ if (!base::android::OnJNIOnLoadRegisterJNI(vm) || !RegisterJNI() ||
+ !NativeInit()) {
return -1;
-
+ }
return JNI_VERSION_1_4;
}

Powered by Google App Engine
This is Rietveld 408576698