Commit efdb6c8d authored by vogelheim's avatar vogelheim Committed by Commit bot

Fix builds w/ component=="shared_library" and v8_use_external_startup_data==1.

R=machenbach@chromium.org
BUG=

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

Cr-Commit-Position: refs/heads/master@{#25784}
parent e6198a0f
...@@ -259,13 +259,14 @@ ...@@ -259,13 +259,14 @@
# cctest can't be built against a shared library, so we need to # cctest can't be built against a shared library, so we need to
# depend on the underlying static target in that case. # depend on the underlying static target in that case.
'conditions': [ 'conditions': [
['v8_use_snapshot=="true"', { ['v8_use_snapshot=="true" and v8_use_external_startup_data==0', {
'dependencies': ['../../tools/gyp/v8.gyp:v8_snapshot'], 'dependencies': ['../../tools/gyp/v8.gyp:v8_snapshot'],
}, }],
{ ['v8_use_snapshot=="true" and v8_use_external_startup_data==1', {
'dependencies': [ 'dependencies': ['../../tools/gyp/v8.gyp:v8_external_snapshot'],
'../../tools/gyp/v8.gyp:v8_nosnapshot', }],
], ['v8_use_snapshot!="true"', {
'dependencies': ['../../tools/gyp/v8.gyp:v8_nosnapshot'],
}], }],
], ],
}, { }, {
......
...@@ -106,13 +106,14 @@ ...@@ -106,13 +106,14 @@
# compiler-unittests can't be built against a shared library, so we # compiler-unittests can't be built against a shared library, so we
# need to depend on the underlying static target in that case. # need to depend on the underlying static target in that case.
'conditions': [ 'conditions': [
['v8_use_snapshot=="true"', { ['v8_use_snapshot=="true" and v8_use_external_startup_data==0', {
'dependencies': ['../../tools/gyp/v8.gyp:v8_snapshot'], 'dependencies': ['../../tools/gyp/v8.gyp:v8_snapshot'],
}, }],
{ ['v8_use_snapshot=="true" and v8_use_external_startup_data==1', {
'dependencies': [ 'dependencies': ['../../tools/gyp/v8.gyp:v8_external_snapshot'],
'../../tools/gyp/v8.gyp:v8_nosnapshot', }],
], ['v8_use_snapshot!="true"', {
'dependencies': ['../../tools/gyp/v8.gyp:v8_nosnapshot'],
}], }],
], ],
}, { }, {
......
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