diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-10-22 19:39:01 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-10-22 19:39:01 +0100 |
| commit | 32f4b921e70a60d19c3330cffc87f26761c6f38b (patch) | |
| tree | 5eae95f1c14aa71ee15ca3d8a54c9a0465e0a348 /WebKit | |
| parent | 7e45393fdb6cea48b293dbb02d098b417f9e6d54 (diff) | |
| download | external_webkit-32f4b921e70a60d19c3330cffc87f26761c6f38b.zip external_webkit-32f4b921e70a60d19c3330cffc87f26761c6f38b.tar.gz external_webkit-32f4b921e70a60d19c3330cffc87f26761c6f38b.tar.bz2 | |
Fix for ALT_HTTP build break
Was broken by this CL:
https://android-git.corp.google.com/g/#change,75473
Change-Id: I6f60fd1e19eafe84f9d2f72f556493a25c2caf0e
Diffstat (limited to 'WebKit')
| -rw-r--r-- | WebKit/Android.mk | 4 | ||||
| -rw-r--r-- | WebKit/android/jni/CookieManager.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/WebKit/Android.mk b/WebKit/Android.mk index e640e02..7906da3 100644 --- a/WebKit/Android.mk +++ b/WebKit/Android.mk @@ -38,8 +38,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ android/WebCoreSupport/WebRequest.cpp \ android/WebCoreSupport/WebRequestContext.cpp \ android/WebCoreSupport/WebResourceRequest.cpp \ - android/WebCoreSupport/WebResponse.cpp \ - android/jni/CookieManager.cpp + android/WebCoreSupport/WebResponse.cpp else LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ android/WebCoreSupport/ResourceLoaderAndroid.cpp @@ -58,6 +57,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ \ android/icu/unicode/ucnv.cpp \ \ + android/jni/CookieManager.cpp \ android/jni/DeviceMotionAndOrientationManager.cpp \ android/jni/DeviceMotionClientImpl.cpp \ android/jni/DeviceOrientationClientImpl.cpp \ diff --git a/WebKit/android/jni/CookieManager.cpp b/WebKit/android/jni/CookieManager.cpp index 9672160..037141f 100644 --- a/WebKit/android/jni/CookieManager.cpp +++ b/WebKit/android/jni/CookieManager.cpp @@ -37,6 +37,7 @@ namespace android { static const char* javaCookieManagerClass = "android/webkit/CookieManager"; static void removeAllCookie(JNIEnv* env, jobject) { +#if USE(CHROME_NETWORK_STACK) WebRequestContext::GetContext(false)->cookie_store()->GetCookieMonster()->DeleteAllCreatedAfter(Time(), true); // This will lazily create a new private browsing context. However, if the // context doesn't already exist, there's no need to create it, as cookies @@ -44,6 +45,7 @@ static void removeAllCookie(JNIEnv* env, jobject) { // TODO: Consider adding an optimisation to not create the context if it // doesn't already exist. WebRequestContext::GetContext(true)->cookie_store()->GetCookieMonster()->DeleteAllCreatedAfter(Time(), true); +#endif } static JNINativeMethod gCookieManagerMethods[] = { |