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 /tools/gyp | |
| 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 'tools/gyp')
| -rw-r--r-- | tools/gyp/v8.gyp | 41 |
1 files changed, 8 insertions, 33 deletions
diff --git a/tools/gyp/v8.gyp b/tools/gyp/v8.gyp index 6dab52d8..88044540 100644 --- a/tools/gyp/v8.gyp +++ b/tools/gyp/v8.gyp @@ -41,6 +41,7 @@ 'ENABLE_LOGGING_AND_PROFILING', 'ENABLE_DEBUGGER_SUPPORT', 'ENABLE_VMSTATE_TRACKING', + 'V8_FAST_TLS', ], 'conditions': [ ['OS!="mac"', { @@ -211,38 +212,6 @@ }, }, { - 'target_name': 'v8_preparser', - 'include_dirs': [ - '../../include', - '../../src', - ], - 'sources': [ - '../../src/allocation.cc', - '../../src/hashmap.cc', - '../../src/preparse-data.cc', - '../../src/preparser.cc', - '../../src/preparser-api.cc', - '../../src/scanner-base.cc', - '../../src/token.cc', - '../../src/unicode.cc', - ], - 'conditions': [ - ['OS=="win" and component=="shared_library"', { - 'sources': [ '../../src/v8preparserdll-main.cc' ], - 'defines': [ 'BUILDING_V8_SHARED' ], - 'direct_dependent_settings': { - 'defines': [ 'USING_V8_SHARED' ] - }, - 'type': '<(component)', - } , { - 'type': 'none' - }], - ['OS!="win"', { - 'type': '<(library)' - }], - ] - }, - { 'target_name': 'v8_snapshot', 'type': '<(library)', 'conditions': [ @@ -435,6 +404,8 @@ '../../src/jump-target.h', '../../src/jsregexp.cc', '../../src/jsregexp.h', + '../../src/isolate.cc', + '../../src/isolate.h', '../../src/list-inl.h', '../../src/list.h', '../../src/lithium.cc', @@ -455,7 +426,6 @@ '../../src/macro-assembler.h', '../../src/mark-compact.cc', '../../src/mark-compact.h', - '../../src/memory.h', '../../src/messages.cc', '../../src/messages.h', '../../src/natives.h', @@ -468,6 +438,9 @@ '../../src/objects.h', '../../src/parser.cc', '../../src/parser.h', + '../../src/platform-tls-mac.h', + '../../src/platform-tls-win32.h', + '../../src/platform-tls.h', '../../src/platform.h', '../../src/preparse-data.cc', '../../src/preparse-data.h', @@ -511,6 +484,7 @@ '../../src/serialize.cc', '../../src/serialize.h', '../../src/shell.h', + '../../src/small-pointer-list.h', '../../src/smart-pointer.h', '../../src/snapshot-common.cc', '../../src/snapshot.h', @@ -544,6 +518,7 @@ '../../src/v8.h', '../../src/v8checks.h', '../../src/v8globals.h', + '../../src/v8memory.h', '../../src/v8threads.cc', '../../src/v8threads.h', '../../src/v8utils.h', |