summaryrefslogtreecommitdiffstats
path: root/JavaScriptCore/JavaScriptCore.scons
diff options
context:
space:
mode:
authorFeng Qian <>2009-04-10 18:11:29 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-04-10 18:11:29 -0700
commit8f72e70a9fd78eec56623b3a62e68f16b7b27e28 (patch)
tree181bf9a400c30a1bf34ea6d72560e8d00111d549 /JavaScriptCore/JavaScriptCore.scons
parent7ed56f225e0ade046e1c2178977f72b2d896f196 (diff)
downloadexternal_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.zip
external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.tar.gz
external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.tar.bz2
AI 145796: Land the WebKit merge @r42026.
Automated import of CL 145796
Diffstat (limited to 'JavaScriptCore/JavaScriptCore.scons')
-rw-r--r--JavaScriptCore/JavaScriptCore.scons2
1 files changed, 2 insertions, 0 deletions
diff --git a/JavaScriptCore/JavaScriptCore.scons b/JavaScriptCore/JavaScriptCore.scons
index 24e5003..30665cf 100644
--- a/JavaScriptCore/JavaScriptCore.scons
+++ b/JavaScriptCore/JavaScriptCore.scons
@@ -114,6 +114,7 @@ sources['runtime'] = [
'runtime/StringPrototype.cpp',
'runtime/Structure.cpp',
'runtime/StructureChain.cpp',
+ 'runtime/TimeoutChecker.cpp',
'runtime/UString.cpp',
]
sources['bytecode'] = [
@@ -149,6 +150,7 @@ sources['wtf'] = [
'wtf/RandomNumber.cpp',
'wtf/RefCountedLeakCounter.cpp',
'wtf/Threading.cpp',
+ 'wtf/TypeTraits.cpp',
'wtf/dtoa.cpp',
]
sources['wtf/unicode'] = [