diff options
| author | michaelbai <michaelbai@chromium.org> | 2015-09-21 14:15:06 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-21 21:15:38 +0000 |
| commit | 2021b8e6fd35ee2d495c97d7cb535d3dc481ff29 (patch) | |
| tree | c74fed29749fc304d7293e6ec69cad1de1464f78 /android_webview | |
| parent | f9493daff38ea46aab8daf14427d314a9700d906 (diff) | |
| download | chromium_src-2021b8e6fd35ee2d495c97d7cb535d3dc481ff29.zip chromium_src-2021b8e6fd35ee2d495c97d7cb535d3dc481ff29.tar.gz chromium_src-2021b8e6fd35ee2d495c97d7cb535d3dc481ff29.tar.bz2 | |
WebView: set version number in JNI initialization
BUG=534518
Review URL: https://codereview.chromium.org/1359713002
Cr-Commit-Position: refs/heads/master@{#350016}
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/lib/main/webview_entry_point.cc | 4 | ||||
| -rw-r--r-- | android_webview/lib/main/webview_jni_onload.cc | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/android_webview/lib/main/webview_entry_point.cc b/android_webview/lib/main/webview_entry_point.cc index 97a259e..12d0fa9 100644 --- a/android_webview/lib/main/webview_entry_point.cc +++ b/android_webview/lib/main/webview_entry_point.cc @@ -2,10 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "android_webview/common/aw_version_info_values.h" #include "android_webview/lib/main/webview_jni_onload.h" #include "base/android/jni_android.h" -#include "base/android/library_loader/library_loader_hooks.h" // This is called by the VM when the shared library is first loaded. // Most of the initialization is done in LibraryLoadedOnMainThread(), not here. @@ -15,8 +13,6 @@ JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { // outside of OnJNIOnLoadRegisterJNI code path. base::android::DisableManualJniRegistration(); - base::android::SetVersionNumber(PRODUCT_VERSION); - if (base::android::IsManualJniRegistrationDisabled()) { base::android::InitVM(vm); } else { diff --git a/android_webview/lib/main/webview_jni_onload.cc b/android_webview/lib/main/webview_jni_onload.cc index 49d3c63..6b7847f 100644 --- a/android_webview/lib/main/webview_jni_onload.cc +++ b/android_webview/lib/main/webview_jni_onload.cc @@ -4,10 +4,12 @@ #include "android_webview/lib/main/webview_jni_onload.h" +#include "android_webview/common/aw_version_info_values.h" #include "android_webview/lib/main/aw_main_delegate.h" #include "android_webview/native/android_webview_jni_registrar.h" #include "base/android/jni_android.h" #include "base/android/jni_registrar.h" +#include "base/android/library_loader/library_loader_hooks.h" #include "base/bind.h" #include "components/external_video_surface/component_jni_registrar.h" #include "components/navigation_interception/component_jni_registrar.h" @@ -45,6 +47,7 @@ bool RegisterJNI(JNIEnv* env) { } bool Init() { + base::android::SetVersionNumber(PRODUCT_VERSION); content::SetContentMainDelegate(new android_webview::AwMainDelegate()); // Initialize url lib here while we are still single-threaded, in case we use |