diff options
| author | Steve Block <steveblock@google.com> | 2012-02-23 04:29:34 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-23 04:29:34 -0800 |
| commit | b7db22cf52aade90ac9d1fb8eb2f2bf37b711b13 (patch) | |
| tree | fdd09976b171f736c3d17abc84e4840a5d3f2eba /Source/WebKit/Android.mk | |
| parent | dfdb101465a930f38ec4294b0b8063c1f0f1bdbc (diff) | |
| parent | 4bcd50196a7fe4c0c909ce6a7cfac6a808336611 (diff) | |
| download | external_webkit-b7db22cf52aade90ac9d1fb8eb2f2bf37b711b13.zip external_webkit-b7db22cf52aade90ac9d1fb8eb2f2bf37b711b13.tar.gz external_webkit-b7db22cf52aade90ac9d1fb8eb2f2bf37b711b13.tar.bz2 | |
Merge "Drop support for Android HTTP stack"
Diffstat (limited to 'Source/WebKit/Android.mk')
| -rw-r--r-- | Source/WebKit/Android.mk | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/Source/WebKit/Android.mk b/Source/WebKit/Android.mk index 36664dd..8ec48da 100644 --- a/Source/WebKit/Android.mk +++ b/Source/WebKit/Android.mk @@ -16,8 +16,10 @@ ## LOCAL_SRC_FILES := \ + android/WebCoreSupport/CacheResult.cpp \ android/WebCoreSupport/CachedFramePlatformDataAndroid.cpp \ android/WebCoreSupport/ChromeClientAndroid.cpp \ + android/WebCoreSupport/ChromiumInit.cpp \ android/WebCoreSupport/ContextMenuClientAndroid.cpp \ android/WebCoreSupport/DeviceMotionClientAndroid.cpp \ android/WebCoreSupport/DeviceOrientationClientAndroid.cpp \ @@ -31,11 +33,6 @@ LOCAL_SRC_FILES := \ android/WebCoreSupport/PlatformBridge.cpp \ android/WebCoreSupport/ResourceLoaderAndroid.cpp \ android/WebCoreSupport/UrlInterceptResponse.cpp \ - -ifeq ($(HTTP_STACK),chrome) -LOCAL_SRC_FILES += \ - android/WebCoreSupport/ChromiumInit.cpp \ - android/WebCoreSupport/CacheResult.cpp \ android/WebCoreSupport/WebCache.cpp \ android/WebCoreSupport/WebCookieJar.cpp \ android/WebCoreSupport/WebUrlLoader.cpp \ @@ -45,7 +42,6 @@ LOCAL_SRC_FILES += \ android/WebCoreSupport/WebResourceRequest.cpp \ android/WebCoreSupport/WebResponse.cpp \ android/WebCoreSupport/WebViewClientError.cpp -endif # HTTP_STACK == chrome LOCAL_SRC_FILES += \ android/RenderSkinAndroid.cpp \ @@ -63,13 +59,11 @@ LOCAL_SRC_FILES += \ android/jni/GeolocationPermissionsBridge.cpp \ android/jni/JavaBridge.cpp \ android/jni/JavaSharedClient.cpp \ - android/jni/JniUtil.cpp \ android/jni/MIMETypeRegistry.cpp \ android/jni/MockGeolocation.cpp \ android/jni/PictureSet.cpp \ android/jni/WebCoreFrameBridge.cpp \ android/jni/WebCoreJni.cpp \ - android/jni/WebCoreResourceLoader.cpp \ android/jni/WebFrameView.cpp \ android/jni/WebHistory.cpp \ android/jni/WebIconDatabase.cpp \ |