| Index: build/common.gypi
|
| diff --git a/build/common.gypi b/build/common.gypi
|
| index 821adc9da32b4c009491ae56536b727f79300d65..f5bc3a56f619937f2cd4aa2ea1a751e896d70713 100644
|
| --- a/build/common.gypi
|
| +++ b/build/common.gypi
|
| @@ -688,6 +688,9 @@
|
| # Disable Dart by default.
|
| 'enable_dart%': 0,
|
|
|
| + # The desired version of Windows SDK can be set in ~/.gyp/include.gypi.
|
| + 'msbuild_toolset%': '',
|
| +
|
| 'conditions': [
|
| # Used to disable Native Client at compile time, for platforms where it
|
| # isn't supported (ARM)
|
| @@ -1039,6 +1042,9 @@
|
| ],
|
| },
|
| 'conditions': [
|
| + ['OS=="win" and "<(msbuild_toolset)"!=""', {
|
| + 'msbuild_toolset': '<(msbuild_toolset)',
|
| + }],
|
| ['branding=="Chrome"', {
|
| 'defines': ['GOOGLE_CHROME_BUILD'],
|
| }, { # else: branding!="Chrome"
|
|
|