Index: skia/skia_library_opts.gyp |
diff --git a/skia/skia_library_opts.gyp b/skia/skia_library_opts.gyp |
index 35eec1b983cde82bfb24aa2528530199c31df7e2..85fdcb3df3ec7ee6ba90069814c5dbc3d52b0754 100644 |
--- a/skia/skia_library_opts.gyp |
+++ b/skia/skia_library_opts.gyp |
@@ -28,6 +28,13 @@ |
{ |
'target_name': 'skia_opts', |
'type': 'static_library', |
+ # The optimize: 'max' scattered throughout are particularly |
+ # important when compiled by MSVC 2013, which seems |
+ # to mis-link-time-compile code that's built with |
+ # different optimization levels. http://crbug.com/543583 |
+ 'variables': { |
+ 'optimize': 'max', |
+ }, |
'includes': [ |
'skia_common.gypi', |
'../build/android/increase_size_for_speed.gypi', |
@@ -102,6 +109,13 @@ |
{ |
'target_name': 'skia_opts_ssse3', |
'type': 'static_library', |
+ # The optimize: 'max' scattered throughout are particularly |
+ # important when compiled by MSVC 2013, which seems |
+ # to mis-link-time-compile code that's built with |
+ # different optimization levels. http://crbug.com/543583 |
+ 'variables': { |
+ 'optimize': 'max', |
+ }, |
'includes': [ |
'skia_common.gypi', |
'../build/android/increase_size_for_speed.gypi', |
@@ -139,6 +153,13 @@ |
{ |
'target_name': 'skia_opts_sse41', |
'type': 'static_library', |
+ # The optimize: 'max' scattered throughout are particularly |
+ # important when compiled by MSVC 2013, which seems |
+ # to mis-link-time-compile code that's built with |
+ # different optimization levels. http://crbug.com/543583 |
+ 'variables': { |
+ 'optimize': 'max', |
+ }, |
'includes': [ |
'skia_common.gypi', |
'../build/android/increase_size_for_speed.gypi', |
@@ -169,6 +190,13 @@ |
{ |
'target_name': 'skia_opts_none', |
'type': 'static_library', |
+ # The optimize: 'max' scattered throughout are particularly |
+ # important when compiled by MSVC 2013, which seems |
+ # to mis-link-time-compile code that's built with |
+ # different optimization levels. http://crbug.com/543583 |
+ 'variables': { |
+ 'optimize': 'max', |
+ }, |
'includes': [ |
'skia_common.gypi', |
'../build/android/increase_size_for_speed.gypi', |