Commit 1b08081a authored by lof84's avatar lof84 Committed by Commit bot

Turn maximize speed on for skia in official build

BUG=543583
R=hendrikw

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

Cr-Commit-Position: refs/heads/master@{#357096}
parent 2983eaac
...@@ -13,6 +13,13 @@ ...@@ -13,6 +13,13 @@
{ {
'target_name': 'skia_library', 'target_name': 'skia_library',
'type': 'static_library', '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': [ 'includes': [
'skia_common.gypi', 'skia_common.gypi',
'skia_library.gypi', 'skia_library.gypi',
...@@ -29,6 +36,13 @@ ...@@ -29,6 +36,13 @@
'targets': [ 'targets': [
{ {
'target_name': 'skia', 'target_name': 'skia',
# 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',
},
'type': 'none', 'type': 'none',
'dependencies': [ 'dependencies': [
'skia_library', 'skia_library',
...@@ -63,6 +77,13 @@ ...@@ -63,6 +77,13 @@
'targets': [ 'targets': [
{ {
'target_name': 'skia', 'target_name': 'skia',
# 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',
},
'type': 'shared_library', 'type': 'shared_library',
'includes': [ 'includes': [
# Include skia_common.gypi first since it contains filename # Include skia_common.gypi first since it contains filename
...@@ -108,6 +129,13 @@ ...@@ -108,6 +129,13 @@
'targets': [ 'targets': [
{ {
'target_name': 'image_operations_bench', 'target_name': 'image_operations_bench',
# 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',
},
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'../base/base.gyp:base', '../base/base.gyp:base',
...@@ -123,6 +151,13 @@ ...@@ -123,6 +151,13 @@
{ {
'target_name': 'filter_fuzz_stub', 'target_name': 'filter_fuzz_stub',
'type': 'executable', 'type': 'executable',
# 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',
},
'dependencies': [ 'dependencies': [
'../base/base.gyp:base', '../base/base.gyp:base',
'../base/base.gyp:test_support_base', '../base/base.gyp:test_support_base',
...@@ -138,6 +173,13 @@ ...@@ -138,6 +173,13 @@
{ {
'target_name': 'skia_mojo', 'target_name': 'skia_mojo',
'type': 'static_library', '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',
},
'dependencies': [ 'dependencies': [
'skia', 'skia',
'../base/base.gyp:base', '../base/base.gyp:base',
......
...@@ -28,6 +28,13 @@ ...@@ -28,6 +28,13 @@
{ {
'target_name': 'skia_opts', 'target_name': 'skia_opts',
'type': 'static_library', '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': [ 'includes': [
'skia_common.gypi', 'skia_common.gypi',
'../build/android/increase_size_for_speed.gypi', '../build/android/increase_size_for_speed.gypi',
...@@ -102,6 +109,13 @@ ...@@ -102,6 +109,13 @@
{ {
'target_name': 'skia_opts_ssse3', 'target_name': 'skia_opts_ssse3',
'type': 'static_library', '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': [ 'includes': [
'skia_common.gypi', 'skia_common.gypi',
'../build/android/increase_size_for_speed.gypi', '../build/android/increase_size_for_speed.gypi',
...@@ -139,6 +153,13 @@ ...@@ -139,6 +153,13 @@
{ {
'target_name': 'skia_opts_sse41', 'target_name': 'skia_opts_sse41',
'type': 'static_library', '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': [ 'includes': [
'skia_common.gypi', 'skia_common.gypi',
'../build/android/increase_size_for_speed.gypi', '../build/android/increase_size_for_speed.gypi',
...@@ -169,6 +190,13 @@ ...@@ -169,6 +190,13 @@
{ {
'target_name': 'skia_opts_none', 'target_name': 'skia_opts_none',
'type': 'static_library', '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': [ 'includes': [
'skia_common.gypi', 'skia_common.gypi',
'../build/android/increase_size_for_speed.gypi', '../build/android/increase_size_for_speed.gypi',
......
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