diff options
| author | wangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-04 17:13:52 +0000 |
|---|---|---|
| committer | wangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-04 17:13:52 +0000 |
| commit | 8e72def8ec6e06cb24bbee05cb76256e12952cbe (patch) | |
| tree | 319a68058bd02ba2d6a6cc3fa519301201d79728 /webkit/support | |
| parent | 2384eae998e1fe9d2a95ffd0005e5df2de2bd3b9 (diff) | |
| download | chromium_src-8e72def8ec6e06cb24bbee05cb76256e12952cbe.zip chromium_src-8e72def8ec6e06cb24bbee05cb76256e12952cbe.tar.gz chromium_src-8e72def8ec6e06cb24bbee05cb76256e12952cbe.tar.bz2 | |
Fix TestWebKitAPI and webkit_unit_tests on Android.
Don't initialize Java environment for unit test mode.
BUG=none
TEST=run TestWebKitAPI and webkit_unit_tests on Android.
Review URL: https://chromiumcodereview.appspot.com/10495006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140313 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/support')
| -rw-r--r-- | webkit/support/platform_support_android.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/webkit/support/platform_support_android.cc b/webkit/support/platform_support_android.cc index 7298b81..458cc722 100644 --- a/webkit/support/platform_support_android.cc +++ b/webkit/support/platform_support_android.cc @@ -39,8 +39,12 @@ void BeforeInitialize(bool unit_test_mode) { // loading and complaining the non-exsistent /etc/xml/catalog file. setenv("XML_CATALOG_FILES", "", 0); - JNIEnv* env = base::android::AttachCurrentThread(); - net::android::RegisterNetworkLibrary(env); + // For now TestWebKitAPI and webkit_unit_tests are standalone executables + // which don't have Java capabilities. Init Java for only DumpRenderTree. + if (!unit_test_mode) { + JNIEnv* env = base::android::AttachCurrentThread(); + net::android::RegisterNetworkLibrary(env); + } } void AfterInitialize(bool unit_test_mode) { |