OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/android/jni_android.h" | |
6 #include "base/android/jni_onload_delegate.h" | |
7 #include "chrome/app/android/chrome_android_initializer.h" | |
8 #include "content/public/app/content_jni_onload.h" | |
5 | 9 |
6 #include "base/android/jni_android.h" | 10 namespace { |
7 #include "chrome/app/android/chrome_android_initializer.h" | 11 |
8 #include "chrome/app/android/chrome_main_delegate_android.h" | 12 class ChromeJNIOnLoadDelegate : public base::android::JNIOnLoadDelegate { |
13 public: | |
14 virtual bool RegisterJNI(JNIEnv* env) override; | |
David Trainor- moved to gerrit
2015/01/28 19:13:25
I'm not 100% sure, but I just looked at web_conten
michaelbai
2015/01/28 19:50:58
Done.
| |
15 virtual bool Init() override; | |
16 }; | |
17 | |
18 bool ChromeJNIOnLoadDelegate::RegisterJNI(JNIEnv* env) { | |
19 return true; | |
20 } | |
21 | |
22 bool ChromeJNIOnLoadDelegate::Init() { | |
23 // TODO(michaelbai): Move the JNI registration from RunChrome() to | |
24 // RegisterJNI(). | |
25 return RunChrome(); | |
26 } | |
27 | |
28 } // namespace | |
29 | |
9 | 30 |
10 // This is called by the VM when the shared library is first loaded. | 31 // This is called by the VM when the shared library is first loaded. |
11 // Note that this file must be included in the final shared_library build step | |
12 // and not in a static library or the JNI_OnLoad symbol won't be included | |
13 // because the Android build is compiled with exclude-libs=ALL to reduce symbol | |
14 // size. | |
15 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { | 32 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { |
16 return RunChrome(vm, ChromeMainDelegateAndroid::Create()); | 33 ChromeJNIOnLoadDelegate delegate; |
34 if (!content::android::OnJNIOnLoad(vm, &delegate)) | |
35 return -1; | |
36 | |
37 return JNI_VERSION_1_4; | |
17 } | 38 } |
OLD | NEW |