diff options
| author | Ben Murdoch <benm@google.com> | 2011-11-30 16:04:58 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-12-02 17:28:30 +0000 |
| commit | 589d6979ff2ef66fca2d8fa51404c369ca5e9250 (patch) | |
| tree | 1d9032fcae9d18a05430a4ba9c14e5c635c4096e /src/SConscript | |
| parent | 69a99ed0b2b2ef69d393c371b03db3a98aaf880e (diff) | |
| download | android_external_v8-589d6979ff2ef66fca2d8fa51404c369ca5e9250.tar.gz android_external_v8-589d6979ff2ef66fca2d8fa51404c369ca5e9250.tar.bz2 android_external_v8-589d6979ff2ef66fca2d8fa51404c369ca5e9250.zip | |
Upgrade to V8 3.6
Merge V8 at 3.6.6.11
Simple merge required updates to makefiles only.
Bug: 5688872
Change-Id: Ib38b7ffbcd409585f6cb6fccc59c767029cecc77
Diffstat (limited to 'src/SConscript')
| -rw-r--r-- | src/SConscript | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/SConscript b/src/SConscript index 453a7c6a..52607f15 100644 --- a/src/SConscript +++ b/src/SConscript @@ -111,8 +111,8 @@ SOURCES = { runtime.cc runtime-profiler.cc safepoint-table.cc - scanner-base.cc scanner.cc + scanner-character-streams.cc scopeinfo.cc scopes.cc serialize.cc @@ -222,7 +222,7 @@ SOURCES = { 'os:solaris': ['platform-solaris.cc', 'platform-posix.cc'], 'os:cygwin': ['platform-cygwin.cc', 'platform-posix.cc'], 'os:nullos': ['platform-nullos.cc'], - 'os:win32': ['platform-win32.cc'], + 'os:win32': ['platform-win32.cc', 'win32-math.cc'], 'mode:release': [], 'mode:debug': [ 'objects-debug.cc', 'prettyprinter.cc', 'regexp-macro-assembler-tracer.cc' @@ -233,15 +233,25 @@ SOURCES = { PREPARSER_SOURCES = { 'all': Split(""" allocation.cc + bignum.cc + bignum-dtoa.cc + cached-powers.cc + conversions.cc + diy-fp.cc + dtoa.cc + fast-dtoa.cc + fixed-dtoa.cc hashmap.cc preparse-data.cc preparser.cc preparser-api.cc - scanner-base.cc + scanner.cc + strtod.cc token.cc unicode.cc utils.cc - """) + """), + 'os:win32': ['win32-math.cc'] } |
