summaryrefslogtreecommitdiffstats
path: root/WebKit
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-09-22 14:54:19 +0100
committerSteve Block <steveblock@google.com>2010-09-29 17:45:48 +0100
commit05f2a24e0649f87dfe4a0c2029eb9ea3baf2323f (patch)
tree3839849da92ce87ae180efe974de22e5d44a5ac2 /WebKit
parent8de7ac488df2f39f82e56811541f4847b3f2e952 (diff)
downloadexternal_webkit-05f2a24e0649f87dfe4a0c2029eb9ea3baf2323f.zip
external_webkit-05f2a24e0649f87dfe4a0c2029eb9ea3baf2323f.tar.gz
external_webkit-05f2a24e0649f87dfe4a0c2029eb9ea3baf2323f.tar.bz2
Merge WebKit at r67908: Fix Makefiles
Change-Id: I2ce222e3f946987d9d544df5f015e06a2e5c7f4d
Diffstat (limited to 'WebKit')
-rw-r--r--WebKit/Android.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/WebKit/Android.mk b/WebKit/Android.mk
index a361974..8de7989 100644
--- a/WebKit/Android.mk
+++ b/WebKit/Android.mk
@@ -24,6 +24,7 @@ LOCAL_SRC_FILES := \
android/WebCoreSupport/DragClientAndroid.cpp \
android/WebCoreSupport/EditorClientAndroid.cpp \
android/WebCoreSupport/FrameLoaderClientAndroid.cpp \
+ android/WebCoreSupport/FrameNetworkingContextAndroid.cpp \
android/WebCoreSupport/GeolocationPermissions.cpp \
android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp \
android/WebCoreSupport/PlatformBridge.cpp \