Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(58)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: tools/gyp/v8.gyp

Issue 1833643002: [Interpreter] Remove separate Ignition snapshot. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/startup-data-util.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gyp/v8.gyp
diff --git a/tools/gyp/v8.gyp b/tools/gyp/v8.gyp
index 520cf0b18dcbc02a6569fa5f5584c5fb898b0190..93a5ebc24640d753cb174f1b3fb0cf1aa33d9ae5 100644
--- a/tools/gyp/v8.gyp
+++ b/tools/gyp/v8.gyp
@@ -121,30 +121,18 @@
}],
['v8_use_snapshot=="true" and v8_use_external_startup_data==1 and want_separate_host_toolset==0', {
'dependencies': ['v8_base', 'v8_external_snapshot'],
- 'inputs': ['<(PRODUCT_DIR)/snapshot_blob.bin'],
- 'conditions': [
- ['v8_separate_ignition_snapshot==1', {
- 'inputs': ['<(PRODUCT_DIR)/snapshot_blob_ignition.bin'],
- }],
- ]
+ 'inputs': [ '<(PRODUCT_DIR)/snapshot_blob.bin', ],
}],
['v8_use_snapshot=="true" and v8_use_external_startup_data==1 and want_separate_host_toolset==1', {
'dependencies': ['v8_base', 'v8_external_snapshot'],
'target_conditions': [
['_toolset=="host"', {
- 'inputs': ['<(PRODUCT_DIR)/snapshot_blob_host.bin'],
+ 'inputs': [
+ '<(PRODUCT_DIR)/snapshot_blob_host.bin',
+ ],
}, {
- 'inputs': ['<(PRODUCT_DIR)/snapshot_blob.bin'],
- }],
- ],
- 'conditions': [
- ['v8_separate_ignition_snapshot==1', {
- 'target_conditions': [
- ['_toolset=="host"', {
- 'inputs': ['<(PRODUCT_DIR)/snapshot_blob_ignition_host.bin'],
- }, {
- 'inputs': ['<(PRODUCT_DIR)/snapshot_blob_ignition.bin'],
- }],
+ 'inputs': [
+ '<(PRODUCT_DIR)/snapshot_blob.bin',
],
}],
],
@@ -212,6 +200,7 @@
],
'variables': {
'mksnapshot_flags': [
+ '--ignition',
Michael Achenbach 2016/03/24 11:29:32 Does that mean we'll ship this in our current prod
Yang 2016/03/24 11:36:25 Why not just call Interpreter::Initialize() uncond
rmcilroy 2016/03/24 12:10:38 Good point, done.
Michael Starzinger 2016/03/24 13:19:25 +1, I also prefer the new approach. Thanks for cha
'--log-snapshot-positions',
'--logfile', '<(INTERMEDIATE_DIR)/snapshot.log',
],
@@ -298,68 +287,6 @@
],
},
}],
- # Extra snapshot blob for ignition.
- ['v8_separate_ignition_snapshot==1', {
- # This is concatenated to the other actions list of
- # v8_external_snapshot.
- 'actions': [
- {
- 'action_name': 'run_mksnapshot (ignition)',
- 'inputs': ['<(mksnapshot_exec)'],
- 'variables': {
- # TODO: Extract common mksnapshot_flags to a separate
- # variable.
- 'mksnapshot_flags_ignition': [
- '--ignition',
- '--log-snapshot-positions',
- '--logfile', '<(INTERMEDIATE_DIR)/snapshot_ignition.log',
- ],
- 'conditions': [
- ['v8_random_seed!=0', {
- 'mksnapshot_flags_ignition': ['--random-seed', '<(v8_random_seed)'],
- }],
- ['v8_vector_stores!=0', {
- 'mksnapshot_flags_ignition': ['--vector-stores'],
- }],
- ],
- },
- 'conditions': [
- ['want_separate_host_toolset==1', {
- 'target_conditions': [
- ['_toolset=="host"', {
- 'outputs': ['<(PRODUCT_DIR)/snapshot_blob_ignition_host.bin'],
- 'action': [
- '<(mksnapshot_exec)',
- '<@(mksnapshot_flags_ignition)',
- '--startup_blob', '<(PRODUCT_DIR)/snapshot_blob_ignition_host.bin',
- '<(embed_script)',
- '<(warmup_script)',
- ],
- }, {
- 'outputs': ['<(PRODUCT_DIR)/snapshot_blob_ignition.bin'],
- 'action': [
- '<(mksnapshot_exec)',
- '<@(mksnapshot_flags_ignition)',
- '--startup_blob', '<(PRODUCT_DIR)/snapshot_blob_ignition.bin',
- '<(embed_script)',
- '<(warmup_script)',
- ],
- }],
- ],
- }, {
- 'outputs': ['<(PRODUCT_DIR)/snapshot_blob_ignition.bin'],
- 'action': [
- '<(mksnapshot_exec)',
- '<@(mksnapshot_flags_ignition)',
- '--startup_blob', '<(PRODUCT_DIR)/snapshot_blob_ignition.bin',
- '<(embed_script)',
- '<(warmup_script)',
- ],
- }],
- ],
- },
- ],
- }],
],
'dependencies': [
'v8_base',
@@ -374,9 +301,12 @@
'actions': [
{
'action_name': 'run_mksnapshot (external)',
- 'inputs': ['<(mksnapshot_exec)'],
+ 'inputs': [
+ '<(mksnapshot_exec)',
+ ],
'variables': {
'mksnapshot_flags': [
+ '--ignition',
'--log-snapshot-positions',
'--logfile', '<(INTERMEDIATE_DIR)/snapshot.log',
],
@@ -393,7 +323,9 @@
['want_separate_host_toolset==1', {
'target_conditions': [
['_toolset=="host"', {
- 'outputs': ['<(PRODUCT_DIR)/snapshot_blob_host.bin'],
+ 'outputs': [
+ '<(PRODUCT_DIR)/snapshot_blob_host.bin',
+ ],
'action': [
'<(mksnapshot_exec)',
'<@(mksnapshot_flags)',
@@ -402,7 +334,9 @@
'<(warmup_script)',
],
}, {
- 'outputs': ['<(PRODUCT_DIR)/snapshot_blob.bin'],
+ 'outputs': [
+ '<(PRODUCT_DIR)/snapshot_blob.bin',
+ ],
'action': [
'<(mksnapshot_exec)',
'<@(mksnapshot_flags)',
@@ -413,7 +347,9 @@
}],
],
}, {
- 'outputs': ['<(PRODUCT_DIR)/snapshot_blob.bin'],
+ 'outputs': [
+ '<(PRODUCT_DIR)/snapshot_blob.bin',
+ ],
'action': [
'<(mksnapshot_exec)',
'<@(mksnapshot_flags)',
« no previous file with comments | « src/startup-data-util.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698