diff options
| author | Ben Murdoch <benm@google.com> | 2011-11-30 16:03:39 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-12-02 17:28:02 +0000 |
| commit | 69a99ed0b2b2ef69d393c371b03db3a98aaf880e (patch) | |
| tree | 6438154d0f3ab526b9206f8860fa4db5cf073c11 /src/SConscript | |
| parent | 3fb3ca8c7ca439d408449a395897395c0faae8d1 (diff) | |
| download | android_external_v8-69a99ed0b2b2ef69d393c371b03db3a98aaf880e.tar.gz android_external_v8-69a99ed0b2b2ef69d393c371b03db3a98aaf880e.tar.bz2 android_external_v8-69a99ed0b2b2ef69d393c371b03db3a98aaf880e.zip | |
Upgrade to V8 3.5
Merge V8 3.5.10.24
Simple merge required updates to makefiles only.
Bug: 5688872
Change-Id: I0acdb9a1a53919d84e9a7525308e8371739d2f06
Diffstat (limited to 'src/SConscript')
| -rw-r--r--[-rwxr-xr-x] | src/SConscript | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/SConscript b/src/SConscript index b45a5677..453a7c6a 100755..100644 --- a/src/SConscript +++ b/src/SConscript @@ -32,6 +32,7 @@ sys.path.append(join(root_dir, 'tools')) import js2c Import('context') Import('tools') +Import('d8_env') SOURCES = { @@ -65,6 +66,7 @@ SOURCES = { disassembler.cc diy-fp.cc dtoa.cc + elements.cc execution.cc factory.cc flags.cc @@ -307,6 +309,7 @@ debug-debugger.js EXPERIMENTAL_LIBRARY_FILES = ''' proxy.js +weakmap.js '''.split() @@ -338,7 +341,7 @@ def ConfigureObjectFiles(): else: d8_files = context.GetRelevantSources(D8_FULL_FILES) d8_objs = [d8_js_obj] - d8_objs.append(context.ConfigureObject(env, [d8_files])) + d8_objs.append(context.ConfigureObject(d8_env, [d8_files])) # Combine the JavaScript library files into a single C++ file and # compile it. |