diff options
author | Steve Block <steveblock@google.com> | 2011-05-24 12:43:12 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-05-24 13:42:09 +0100 |
commit | 1e0659c275bb392c045087af4f6b0d7565cb3d77 (patch) | |
tree | 09febd313ccef178417974f7b7098e89e20bfd93 /tools/gyp/v8.gyp | |
parent | b8e0da25ee8efac3bb05cd6b2730aafbd96119f4 (diff) | |
download | android_external_v8-1e0659c275bb392c045087af4f6b0d7565cb3d77.tar.gz android_external_v8-1e0659c275bb392c045087af4f6b0d7565cb3d77.tar.bz2 android_external_v8-1e0659c275bb392c045087af4f6b0d7565cb3d77.zip |
Update V8 to r6768 as required by WebKit r78450
Change-Id: Ib8868ff7147a76547a8d1d85f257ebe8546a3d3f
Diffstat (limited to 'tools/gyp/v8.gyp')
-rw-r--r-- | tools/gyp/v8.gyp | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/tools/gyp/v8.gyp b/tools/gyp/v8.gyp index 024ecd7a..15185671 100644 --- a/tools/gyp/v8.gyp +++ b/tools/gyp/v8.gyp @@ -32,6 +32,7 @@ 'gcc_version%': 'unknown', 'v8_target_arch%': '<(target_arch)', 'v8_use_snapshot%': 'true', + 'v8_use_liveobjectlist%': 'false', }, 'conditions': [ ['use_system_v8==0', { @@ -66,6 +67,14 @@ }], ], }], + ['v8_use_liveobjectlist=="true"', { + 'defines': [ + 'ENABLE_DEBUGGER_SUPPORT', + 'INSPECTOR', + 'OBJECT_PRINT', + 'LIVEOBJECTLIST', + ], + }], ], 'configurations': { 'Debug': { @@ -417,6 +426,8 @@ '../../src/ic-inl.h', '../../src/ic.cc', '../../src/ic.h', + '../../src/inspector.cc', + '../../src/inspector.h', '../../src/interpreter-irregexp.cc', '../../src/interpreter-irregexp.h', '../../src/jump-target-inl.h', @@ -430,8 +441,12 @@ '../../src/lithium.h', '../../src/lithium-allocator.cc', '../../src/lithium-allocator.h', + '../../src/lithium-allocator-inl.h', '../../src/liveedit.cc', '../../src/liveedit.h', + '../../src/liveobjectlist-inl.h', + '../../src/liveobjectlist.cc', + '../../src/liveobjectlist.h', '../../src/log-inl.h', '../../src/log-utils.cc', '../../src/log-utils.h', @@ -451,8 +466,6 @@ '../../src/objects-visiting.h', '../../src/objects.cc', '../../src/objects.h', - '../../src/oprofile-agent.h', - '../../src/oprofile-agent.cc', '../../src/parser.cc', '../../src/parser.h', '../../src/platform.h', @@ -677,6 +690,8 @@ '../../src/x64/jump-target-x64.cc', '../../src/x64/lithium-codegen-x64.cc', '../../src/x64/lithium-codegen-x64.h', + '../../src/x64/lithium-gap-resolver-x64.cc', + '../../src/x64/lithium-gap-resolver-x64.h', '../../src/x64/lithium-x64.cc', '../../src/x64/lithium-x64.h', '../../src/x64/macro-assembler-x64.cc', @@ -733,8 +748,7 @@ 'sources': [ '../../src/platform-win32.cc', ], - # 4355, 4800 came from common.vsprops - 'msvs_disabled_warnings': [4355, 4800], + 'msvs_disabled_warnings': [4351, 4355, 4800], 'link_settings': { 'libraries': [ '-lwinmm.lib' ], }, |