summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorevanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-15 22:41:14 +0000
committerevanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-15 22:41:14 +0000
commitbfbafe26d2d97f378da686f2a64016ac25562c16 (patch)
treea37dcc83f0f77ef2b807af872127f6f9177d55d4 /webkit
parent8e4a1193a43e4ae7180a630b756e2dc328015693 (diff)
downloadchromium_src-bfbafe26d2d97f378da686f2a64016ac25562c16.zip
chromium_src-bfbafe26d2d97f378da686f2a64016ac25562c16.tar.gz
chromium_src-bfbafe26d2d97f378da686f2a64016ac25562c16.tar.bz2
Fix Linux build.
Review URL: http://codereview.chromium.org/7425 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3432 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/SConscript4
-rw-r--r--webkit/SConscript.port8
2 files changed, 11 insertions, 1 deletions
diff --git a/webkit/SConscript b/webkit/SConscript
index 9ace6ab..519e809 100644
--- a/webkit/SConscript
+++ b/webkit/SConscript
@@ -112,15 +112,19 @@ env.Prepend(
'$WEBKIT_DIR/port/loader/icon',
'$WEBKIT_DIR/port/page',
'$WEBKIT_DIR/port/page/animation',
+ '$WEBKIT_DIR/port/page/chromium',
'$WEBKIT_DIR/port/platform',
+ '$WEBKIT_DIR/port/platform/chromium',
'$WEBKIT_DIR/port/platform/graphics',
'$WEBKIT_DIR/port/platform/$WEBKIT_PLATFORM_SUBDIR',
'$WEBKIT_DIR/port/svg/graphics',
'$WEBKIT_DIR/port/platform/network',
+ '$WEBKIT_DIR/port/platform/network/chromium',
'$WEBKIT_DIR/port/platform/network/$WEBKIT_PLATFORM_SUBDIR',
'$WEBKIT_DIR/port/platform/sql',
'$WEBKIT_DIR/port/platform/text',
'$WEBKIT_DIR/port/plugins',
+ '$WEBKIT_DIR/port/plugins/chromium',
'$WEBKIT_DIR/port/rendering',
'$WEBKIT_DIR/port/rendering/style',
'$WEBKIT_DIR/port/storage',
diff --git a/webkit/SConscript.port b/webkit/SConscript.port
index 5c81d39..0fd7279 100644
--- a/webkit/SConscript.port
+++ b/webkit/SConscript.port
@@ -120,6 +120,12 @@ if env['PLATFORM'] in ('posix', 'darwin'):
# to Mac and Linux.
remove_files = [
'$PORT_DIR/bridge/chromium/PluginsChromium.cpp',
+ '$PORT_DIR/platform/network/chromium/NetworkStateNotifierChromium.cpp',
+ '$PORT_DIR/page/chromium/AccessibilityObjectChromium.cpp',
+ '$PORT_DIR/page/chromium/AXObjectCacheChromium.cpp',
+ '$PORT_DIR/page/chromium/DragControllerChromium.cpp',
+ '$PORT_DIR/page/chromium/EventHandlerChromium.cpp',
+ '$PORT_DIR/page/chromium/FrameChromium.cpp',
'$PORT_DIR/platform/chromium/ContextMenuItemChromium.cpp',
'$PORT_DIR/platform/chromium/ContextMenuChromium.cpp',
'$PORT_DIR/platform/chromium/CursorChromium.cpp',
@@ -195,7 +201,7 @@ if env.get('KJS'):
])
else:
input_files.extend([
- '$PORT_DIR/bridge/ScriptControllerV8.cpp',
+ '$PORT_DIR/bindings/v8/ScriptController.cpp',
'$PORT_DIR/bridge/ExceptionContextV8.cpp',
])