summaryrefslogtreecommitdiffstats
path: root/Source/WebKit
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebKit')
-rw-r--r--Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h1
-rw-r--r--Source/WebKit/android/WebCoreSupport/ChromiumInit.cpp3
2 files changed, 4 insertions, 0 deletions
diff --git a/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h b/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h
index 9728aad..6402702 100644
--- a/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h
+++ b/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h
@@ -46,6 +46,7 @@
#endif
#include <android/net/android_network_library_impl.h>
+#include <android/jni/jni_utils.h>
#include <base/callback.h>
#include <base/memory/ref_counted.h>
#include <base/message_loop_proxy.h>
diff --git a/Source/WebKit/android/WebCoreSupport/ChromiumInit.cpp b/Source/WebKit/android/WebCoreSupport/ChromiumInit.cpp
index 2bb4d3d..500975c 100644
--- a/Source/WebKit/android/WebCoreSupport/ChromiumInit.cpp
+++ b/Source/WebKit/android/WebCoreSupport/ChromiumInit.cpp
@@ -27,6 +27,8 @@
#include "ChromiumInit.h"
#include "ChromiumIncludes.h"
+#include "JNIUtility.h"
+#include "jni.h"
#include <cutils/log.h>
#include <string>
@@ -68,6 +70,7 @@ void initChromium()
networkChangeNotifier.reset(net::NetworkChangeNotifier::Create());
net::HttpNetworkLayer::EnableSpdy("npn");
initCalled = true;
+ jni::SetJavaVM(JSC::Bindings::getJavaVM());
}
}