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

Unified Diff: testing/android/native_test_jni_onload.cc

Issue 1071573003: [Android] Move testing/android/ to testing/android/native_test/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: removing errant commit Created 5 years, 8 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
« no previous file with comments | « testing/android/native_test/native_test_util.cc ('k') | testing/android/native_test_launcher.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: testing/android/native_test_jni_onload.cc
diff --git a/testing/android/native_test_jni_onload.cc b/testing/android/native_test_jni_onload.cc
deleted file mode 100644
index de42356d08c6b3228d2e651c0c84cd480f446a01..0000000000000000000000000000000000000000
--- a/testing/android/native_test_jni_onload.cc
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "base/android/base_jni_onload.h"
-#include "base/android/jni_android.h"
-#include "base/bind.h"
-#include "testing/android/native_test_launcher.h"
-
-namespace {
-
-bool RegisterJNI(JNIEnv* env) {
- return RegisterNativeTestJNI(env);
-}
-
-bool Init() {
- InstallHandlers();
- return true;
-}
-
-} // namespace
-
-
-// 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))
- return -1;
-
- return JNI_VERSION_1_4;
-}
« no previous file with comments | « testing/android/native_test/native_test_util.cc ('k') | testing/android/native_test_launcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698