diff options
| author | Steve Block <steveblock@google.com> | 2011-05-26 01:26:41 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-02 15:09:56 +0100 |
| commit | 44f0eee88ff00398ff7f715fab053374d808c90d (patch) | |
| tree | addd100e906cd43f843f3aaf64b445f17f46fe0f /src/SConscript | |
| parent | 1b63b9ad386abd62f61af0e29246a687f5311b53 (diff) | |
| download | android_external_v8-44f0eee88ff00398ff7f715fab053374d808c90d.tar.gz android_external_v8-44f0eee88ff00398ff7f715fab053374d808c90d.tar.bz2 android_external_v8-44f0eee88ff00398ff7f715fab053374d808c90d.zip | |
Update V8 to r7427: Initial merge by git
As required by WebKit r82507
Change-Id: I7ae83ef3f689356043b4929255b7c1dd31d8c5df
Diffstat (limited to 'src/SConscript')
| -rwxr-xr-x | src/SConscript | 31 |
1 files changed, 27 insertions, 4 deletions
diff --git a/src/SConscript b/src/SConscript index 34ca91ca..3b9968ee 100755 --- a/src/SConscript +++ b/src/SConscript @@ -84,6 +84,7 @@ SOURCES = { ic.cc inspector.cc interpreter-irregexp.cc + isolate.cc jsregexp.cc jump-target.cc lithium-allocator.cc @@ -162,18 +163,23 @@ SOURCES = { arm/assembler-arm.cc """), 'arch:mips': Split(""" + jump-target-light.cc + virtual-frame-light.cc mips/assembler-mips.cc mips/builtins-mips.cc + mips/code-stubs-mips.cc mips/codegen-mips.cc mips/constants-mips.cc mips/cpu-mips.cc mips/debug-mips.cc + mips/deoptimizer-mips.cc mips/disasm-mips.cc - mips/full-codegen-mips.cc mips/frames-mips.cc + mips/full-codegen-mips.cc mips/ic-mips.cc mips/jump-target-mips.cc mips/macro-assembler-mips.cc + mips/regexp-macro-assembler-mips.cc mips/register-allocator-mips.cc mips/stub-cache-mips.cc mips/virtual-frame-mips.cc @@ -244,6 +250,20 @@ SOURCES = { } +PREPARSER_SOURCES = { + 'all': Split(""" + allocation.cc + hashmap.cc + preparse-data.cc + preparser.cc + preparser-api.cc + scanner-base.cc + token.cc + unicode.cc + """) +} + + D8_FILES = { 'all': [ 'd8.cc', 'd8-debug.cc' @@ -329,6 +349,9 @@ def ConfigureObjectFiles(): source_objs = context.ConfigureObject(env, source_files) non_snapshot_files = [source_objs] + preparser_source_files = context.GetRelevantSources(PREPARSER_SOURCES) + preparser_objs = context.ConfigureObject(env, preparser_source_files) + # Create snapshot if necessary. For cross compilation you should either # do without snapshots and take the performance hit or you should build a # host VM with the simulator=arm and snapshot=on options and then take the @@ -349,8 +372,8 @@ def ConfigureObjectFiles(): else: snapshot_obj = empty_snapshot_obj library_objs = [non_snapshot_files, libraries_obj, snapshot_obj] - return (library_objs, d8_objs, [mksnapshot]) + return (library_objs, d8_objs, [mksnapshot], preparser_objs) -(library_objs, d8_objs, mksnapshot) = ConfigureObjectFiles() -Return('library_objs d8_objs mksnapshot') +(library_objs, d8_objs, mksnapshot, preparser_objs) = ConfigureObjectFiles() +Return('library_objs d8_objs mksnapshot preparser_objs') |
