diff options
| author | Ben Murdoch <benm@google.com> | 2011-11-30 15:57:28 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-12-02 17:27:08 +0000 |
| commit | 257744e915dfc84d6d07a6b2accf8402d9ffc708 (patch) | |
| tree | 19d8782d5686697f36b1771e7fcd46f290b82c3c /src/SConscript | |
| parent | 92022043ea907575278de828a5c9cf6939b51e5e (diff) | |
| download | android_external_v8-257744e915dfc84d6d07a6b2accf8402d9ffc708.tar.gz android_external_v8-257744e915dfc84d6d07a6b2accf8402d9ffc708.tar.bz2 android_external_v8-257744e915dfc84d6d07a6b2accf8402d9ffc708.zip | |
Upgrade to V8 3.3
Merge V8 at 3.3.10.39
Simple merge required updates to makefiles only.
Bug: 5688872
Change-Id: I14703f418235f5ce6013b9b3e2e502407a9f6dfd
Diffstat (limited to 'src/SConscript')
| -rwxr-xr-x | src/SConscript | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/src/SConscript b/src/SConscript index 06ee907c..fe21d02f 100755 --- a/src/SConscript +++ b/src/SConscript @@ -68,7 +68,6 @@ SOURCES = { execution.cc factory.cc flags.cc - frame-element.cc frames.cc full-codegen.cc func-name-inferrer.cc @@ -86,6 +85,7 @@ SOURCES = { inspector.cc interpreter-irregexp.cc isolate.cc + json-parser.cc jsregexp.cc lithium-allocator.cc lithium.cc @@ -122,7 +122,6 @@ SOURCES = { strtod.cc stub-cache.cc token.cc - top.cc type-info.cc unicode.cc utils.cc @@ -297,6 +296,11 @@ debug-debugger.js '''.split() +EXPERIMENTAL_LIBRARY_FILES = ''' +proxy.js +'''.split() + + def Abort(message): print message sys.exit(1) @@ -321,9 +325,16 @@ def ConfigureObjectFiles(): # compile it. library_files = [s for s in LIBRARY_FILES] library_files.append('macros.py') - libraries_src, libraries_empty_src = env.JS2C(['libraries.cc', 'libraries-empty.cc'], library_files, TYPE='CORE') + libraries_src = env.JS2C(['libraries.cc'], library_files, TYPE='CORE') libraries_obj = context.ConfigureObject(env, libraries_src, CPPPATH=['.']) + # Combine the experimental JavaScript library files into a C++ file + # and compile it. + experimental_library_files = [ s for s in EXPERIMENTAL_LIBRARY_FILES ] + experimental_library_files.append('macros.py') + experimental_libraries_src = env.JS2C(['experimental-libraries.cc'], experimental_library_files, TYPE='EXPERIMENTAL') + experimental_libraries_obj = context.ConfigureObject(env, experimental_libraries_src, CPPPATH=['.']) + source_objs = context.ConfigureObject(env, source_files) non_snapshot_files = [source_objs] @@ -340,7 +351,7 @@ def ConfigureObjectFiles(): mksnapshot_env = env.Copy() mksnapshot_env.Replace(**context.flags['mksnapshot']) mksnapshot_src = 'mksnapshot.cc' - mksnapshot = mksnapshot_env.Program('mksnapshot', [mksnapshot_src, libraries_obj, non_snapshot_files, empty_snapshot_obj], PDB='mksnapshot.exe.pdb') + mksnapshot = mksnapshot_env.Program('mksnapshot', [mksnapshot_src, libraries_obj, experimental_libraries_obj, non_snapshot_files, empty_snapshot_obj], PDB='mksnapshot.exe.pdb') if context.use_snapshot: if context.build_snapshot: snapshot_cc = env.Snapshot('snapshot.cc', mksnapshot, LOGFILE=File('snapshot.log').abspath) @@ -349,7 +360,7 @@ def ConfigureObjectFiles(): snapshot_obj = context.ConfigureObject(env, snapshot_cc, CPPPATH=['.']) else: snapshot_obj = empty_snapshot_obj - library_objs = [non_snapshot_files, libraries_obj, snapshot_obj] + library_objs = [non_snapshot_files, libraries_obj, experimental_libraries_obj, snapshot_obj] return (library_objs, d8_objs, [mksnapshot], preparser_objs) |