summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-03 21:54:06 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-03 21:54:06 +0000
commit8c2ebfa123fc39eac8452ad3d8846506c6a96c01 (patch)
treec3885494a2a63b1d97d27519d7a1265402131086
parent39f729fe207a9e28b1c5e58f9f2261219fec89ef (diff)
downloadchromium_src-8c2ebfa123fc39eac8452ad3d8846506c6a96c01.zip
chromium_src-8c2ebfa123fc39eac8452ad3d8846506c6a96c01.tar.gz
chromium_src-8c2ebfa123fc39eac8452ad3d8846506c6a96c01.tar.bz2
fix build by adding sql and storage files to webcore SConscript
and adding sqlite to the test_shell dependencies TBR=aa Review URL: http://codereview.chromium.org/9275 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4497 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/build/WebCore/SConscript21
-rw-r--r--webkit/build/port/SConscript4
-rw-r--r--webkit/tools/test_shell/SConscript1
3 files changed, 22 insertions, 4 deletions
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index 423fee5..72c5f22 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -397,7 +397,6 @@ input_files = [
'$WEBCORE_DIR/platform/Timer.cpp',
'$WEBCORE_DIR/platform/Widget.cpp',
-
'$WEBCORE_DIR/platform/graphics/AffineTransform.cpp',
'$WEBCORE_DIR/platform/graphics/BitmapImage.cpp',
'$WEBCORE_DIR/platform/graphics/Color.cpp',
@@ -441,6 +440,12 @@ input_files = [
'$WEBCORE_DIR/platform/network/ResourceRequestBase.cpp',
'$WEBCORE_DIR/platform/network/ResourceResponseBase.cpp',
+ '$WEBCORE_DIR/platform/sql/SQLiteAuthorizer.cpp',
+ '$WEBCORE_DIR/platform/sql/SQLiteDatabase.cpp',
+ '$WEBCORE_DIR/platform/sql/SQLiteStatement.cpp',
+ '$WEBCORE_DIR/platform/sql/SQLiteTransaction.cpp',
+ '$WEBCORE_DIR/platform/sql/SQLValue.cpp',
+
'$WEBCORE_DIR/platform/text/AtomicString.cpp',
'$WEBCORE_DIR/platform/text/Base64.cpp',
'$WEBCORE_DIR/platform/text/BidiContext.cpp',
@@ -557,7 +562,6 @@ input_files = [
'$WEBCORE_DIR/rendering/SVGRootInlineBox.cpp',
'$WEBCORE_DIR/rendering/TextControlInnerElements.cpp',
-
'$WEBCORE_DIR/rendering/style/Animation.cpp',
'$WEBCORE_DIR/rendering/style/AnimationList.cpp',
'$WEBCORE_DIR/rendering/style/BindingURI.cpp',
@@ -590,6 +594,19 @@ input_files = [
'$WEBCORE_DIR/rendering/style/TransformOperations.cpp',
'$WEBCORE_DIR/rendering/style/TranslateTransformOperation.cpp',
+ '$WEBCORE_DIR/storage/ChangeVersionWrapper.cpp',
+ '$WEBCORE_DIR/storage/Database.cpp',
+ '$WEBCORE_DIR/storage/DatabaseAuthorizer.cpp',
+ '$WEBCORE_DIR/storage/DatabaseTask.cpp',
+ '$WEBCORE_DIR/storage/DatabaseThread.cpp',
+ '$WEBCORE_DIR/storage/DatabaseTracker.cpp',
+ '$WEBCORE_DIR/storage/OriginQuotaManager.cpp',
+ '$WEBCORE_DIR/storage/OriginUsageRecord.cpp',
+ '$WEBCORE_DIR/storage/SQLResultSet.cpp',
+ '$WEBCORE_DIR/storage/SQLResultSetRowList.cpp',
+ '$WEBCORE_DIR/storage/SQLStatement.cpp',
+ '$WEBCORE_DIR/storage/SQLTransaction.cpp',
+
'$WEBCORE_DIR/svg/ColorDistance.cpp',
'$WEBCORE_DIR/svg/Filter.cpp',
'$WEBCORE_DIR/svg/FilterEffect.cpp',
diff --git a/webkit/build/port/SConscript b/webkit/build/port/SConscript
index 4a80e3a..b7b42c6 100644
--- a/webkit/build/port/SConscript
+++ b/webkit/build/port/SConscript
@@ -72,11 +72,11 @@ env = env.Clone(
'$PORTROOT/html',
'$PORTROOT/page',
'$PORTROOT/xml',
- '$WEBCORE/svg',
+ '$WEBCORE/css',
'$WEBCORE/dom',
'$WEBCORE/html',
- '$WEBCORE/css',
'$WEBCORE/page',
+ '$WEBCORE/svg',
'$WEBCORE/xml',
],
BINDINGS_INCLUDE_FLAG = '--include ',
diff --git a/webkit/tools/test_shell/SConscript b/webkit/tools/test_shell/SConscript
index 8ff5fcd..bf4dbe1 100644
--- a/webkit/tools/test_shell/SConscript
+++ b/webkit/tools/test_shell/SConscript
@@ -48,6 +48,7 @@ env.Append(
'libxslt',
'modp_b64',
'zlib',
+ 'sqlite',
'v8',
'JavaScriptCore_pcre',
'default_plugin',