| Index: build/common.gypi
|
| diff --git a/build/common.gypi b/build/common.gypi
|
| index ae53af23405f48d9fb81ce390134e778aa6598f7..7d83fdee5d01a99f6d61c6a3e72a5aa2b221f40a 100644
|
| --- a/build/common.gypi
|
| +++ b/build/common.gypi
|
| @@ -1199,9 +1199,6 @@
|
| # Disable Dart by default.
|
| 'enable_dart%': 0,
|
|
|
| - # The desired version of Windows SDK can be set in ~/.gyp/include.gypi.
|
| - 'msbuild_toolset%': '',
|
| -
|
| # Native Client is enabled by default.
|
| 'disable_nacl%': 0,
|
|
|
| @@ -2087,9 +2084,6 @@
|
| # See http://crbug.com/162818.
|
| 'cflags+': ['-Wno-sentinel'],
|
| }],
|
| - ['OS=="win" and "<(msbuild_toolset)"!=""', {
|
| - 'msbuild_toolset': '<(msbuild_toolset)',
|
| - }],
|
| ['branding=="Chrome"', {
|
| 'defines': ['GOOGLE_CHROME_BUILD'],
|
| }, { # else: branding!="Chrome"
|
| @@ -2359,16 +2353,6 @@
|
| }
|
| }
|
| }],
|
| - ['"<(GENERATOR)"=="msvs"', {
|
| - 'msvs_settings': {
|
| - 'VCLinkerTool': {
|
| - # Make the pdb name sane. Otherwise foo.exe and foo.dll both
|
| - # have foo.pdb. The ninja generator already defaults to this and
|
| - # can't handle the $(TargetPath) macro.
|
| - 'ProgramDatabaseFile': '$(TargetPath).pdb',
|
| - }
|
| - },
|
| - }],
|
| ], # win_z7!=0
|
| }], # OS==win
|
| ['enable_task_manager==1', {
|
|
|