Skip to content

V
V8
Commit de366e29 authored by machenbach's avatar machenbach Committed by Commit bot
Browse files
Options

[Ignition] Fix separate ignition snapshot for separate toolsets. 

BUG=v8:4280
LOG=N

Review URL: https://codereview.chromium.org/1684543002

Cr-Commit-Position: refs/heads/master@{#33842}
parent edde7b28
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 31 deletions
tools/gyp/v8.gyp
View file @ de366e29
...@@ -120,18 +120,30 @@ ...@@ -120,18 +120,30 @@
}], }],
['v8_use_snapshot=="true" and v8_use_external_startup_data==1 and want_separate_host_toolset==0', { ['v8_use_snapshot=="true" and v8_use_external_startup_data==1 and want_separate_host_toolset==0', {
'dependencies': ['v8_base', 'v8_external_snapshot'], 'dependencies': ['v8_base', 'v8_external_snapshot'],
'inputs': [ '<(PRODUCT_DIR)/snapshot_blob.bin', ], 'inputs': ['<(PRODUCT_DIR)/snapshot_blob.bin'],
'conditions': [
['v8_separate_ignition_snapshot==1', {
'inputs': ['<(PRODUCT_DIR)/snapshot_blob_ignition.bin'],
}],
]
}], }],
['v8_use_snapshot=="true" and v8_use_external_startup_data==1 and want_separate_host_toolset==1', { ['v8_use_snapshot=="true" and v8_use_external_startup_data==1 and want_separate_host_toolset==1', {
'dependencies': ['v8_base', 'v8_external_snapshot'], 'dependencies': ['v8_base', 'v8_external_snapshot'],
'target_conditions': [ 'target_conditions': [
['_toolset=="host"', { ['_toolset=="host"', {
'inputs': [ 'inputs': ['<(PRODUCT_DIR)/snapshot_blob_host.bin'],
'<(PRODUCT_DIR)/snapshot_blob_host.bin',
],
}, { }, {
'inputs': [ 'inputs': ['<(PRODUCT_DIR)/snapshot_blob.bin'],
'<(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'],
}],
], ],
}], }],
], ],
...@@ -283,17 +295,14 @@ ...@@ -283,17 +295,14 @@
], ],
}, },
}], }],
# Extra snapshot blob for ignition. Separate host toolset is not # Extra snapshot blob for ignition.
# supported.
['v8_separate_ignition_snapshot==1', { ['v8_separate_ignition_snapshot==1', {
# This is concatenated to the other actions list of # This is concatenated to the other actions list of
# v8_external_snapshot. # v8_external_snapshot.
'actions': [ 'actions': [
{ {
'action_name': 'run_mksnapshot (ignition)', 'action_name': 'run_mksnapshot (ignition)',
'inputs': [ 'inputs': ['<(mksnapshot_exec)'],
'<(mksnapshot_exec)',
],
'variables': { 'variables': {
# TODO: Extract common mksnapshot_flags to a separate # TODO: Extract common mksnapshot_flags to a separate
# variable. # variable.
...@@ -311,14 +320,36 @@ ...@@ -311,14 +320,36 @@
}], }],
], ],
}, },
'outputs': [ 'conditions': [
'<(PRODUCT_DIR)/snapshot_blob_ignition.bin', ['want_separate_host_toolset==1', {
], 'target_conditions': [
'action': [ ['_toolset=="host"', {
'<(mksnapshot_exec)', 'outputs': ['<(PRODUCT_DIR)/snapshot_blob_ignition_host.bin'],
'<@(mksnapshot_flags_ignition)', 'action': [
'--startup_blob', '<(PRODUCT_DIR)/snapshot_blob_ignition.bin', '<(mksnapshot_exec)',
'<(embed_script)', '<@(mksnapshot_flags_ignition)',
'--startup_blob', '<(PRODUCT_DIR)/snapshot_blob_ignition_host.bin',
'<(embed_script)',
],
}, {
'outputs': ['<(PRODUCT_DIR)/snapshot_blob_ignition.bin'],
'action': [
'<(mksnapshot_exec)',
'<@(mksnapshot_flags_ignition)',
'--startup_blob', '<(PRODUCT_DIR)/snapshot_blob_ignition.bin',
'<(embed_script)',
],
}],
],
}, {
'outputs': ['<(PRODUCT_DIR)/snapshot_blob_ignition.bin'],
'action': [
'<(mksnapshot_exec)',
'<@(mksnapshot_flags_ignition)',
'--startup_blob', '<(PRODUCT_DIR)/snapshot_blob_ignition.bin',
'<(embed_script)',
],
}],
], ],
}, },
], ],
...@@ -337,9 +368,7 @@ ...@@ -337,9 +368,7 @@
'actions': [ 'actions': [
{ {
'action_name': 'run_mksnapshot (external)', 'action_name': 'run_mksnapshot (external)',
'inputs': [ 'inputs': ['<(mksnapshot_exec)'],
'<(mksnapshot_exec)',
],
'variables': { 'variables': {
'mksnapshot_flags': [ 'mksnapshot_flags': [
'--log-snapshot-positions', '--log-snapshot-positions',
...@@ -358,9 +387,7 @@ ...@@ -358,9 +387,7 @@
['want_separate_host_toolset==1', { ['want_separate_host_toolset==1', {
'target_conditions': [ 'target_conditions': [
['_toolset=="host"', { ['_toolset=="host"', {
'outputs': [ 'outputs': ['<(PRODUCT_DIR)/snapshot_blob_host.bin'],
'<(PRODUCT_DIR)/snapshot_blob_host.bin',
],
'action': [ 'action': [
'<(mksnapshot_exec)', '<(mksnapshot_exec)',
'<@(mksnapshot_flags)', '<@(mksnapshot_flags)',
...@@ -368,9 +395,7 @@ ...@@ -368,9 +395,7 @@
'<(embed_script)', '<(embed_script)',
], ],
}, { }, {
'outputs': [ 'outputs': ['<(PRODUCT_DIR)/snapshot_blob.bin'],
'<(PRODUCT_DIR)/snapshot_blob.bin',
],
'action': [ 'action': [
'<(mksnapshot_exec)', '<(mksnapshot_exec)',
'<@(mksnapshot_flags)', '<@(mksnapshot_flags)',
...@@ -380,9 +405,7 @@ ...@@ -380,9 +405,7 @@
}], }],
], ],
}, { }, {
'outputs': [ 'outputs': ['<(PRODUCT_DIR)/snapshot_blob.bin'],
'<(PRODUCT_DIR)/snapshot_blob.bin',
],
'action': [ 'action': [
'<(mksnapshot_exec)', '<(mksnapshot_exec)',
'<@(mksnapshot_flags)', '<@(mksnapshot_flags)',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment