Skip to content

Commit

Permalink
xwalk.gyp: Coalesce some Windows checks together.
Browse files Browse the repository at this point in the history
  • Loading branch information
Raphael Kubo da Costa committed Feb 26, 2016
1 parent 559d583 commit 380f561
Showing 1 changed file with 17 additions and 15 deletions.
32 changes: 17 additions & 15 deletions xwalk.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -375,12 +375,14 @@
'runtime/renderer/xwalk_render_process_observer_generic.h',
],
}],
['OS=="win" and win_use_allocator_shim==1', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],
}],
['OS=="win"', {
'conditions': [
['win_use_allocator_shim==1', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],
}],
],
'configurations': {
'Debug_Base': {
'msvs_settings': {
Expand Down Expand Up @@ -705,12 +707,18 @@
},
},
'conditions': [
['OS=="win" and win_use_allocator_shim==1', {
['OS=="win"', {
'conditions': [
['win_use_allocator_shim==1', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],
}],
],
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
'../sandbox/sandbox.gyp:sandbox',
'dotnet/dotnet_bridge.gyp:dotnet_bridge'
],
}],
['OS=="win"', {
'sources': [
'../content/app/sandbox_helper_win.cc', # Needed by InitializedSandbox
'runtime/resources/xwalk.rc',
Expand All @@ -725,12 +733,6 @@
},
},
}], # OS=="win"
['OS == "win"', {
'dependencies': [
'../sandbox/sandbox.gyp:sandbox',
'dotnet/dotnet_bridge.gyp:dotnet_bridge'
],
}], # OS=="win"
['OS=="mac"', {
'product_name': '<(xwalk_product_name)',
'dependencies!': [
Expand Down

0 comments on commit 380f561

Please sign in to comment.