| Index: skia/skia.gyp
|
| diff --git a/skia/skia.gyp b/skia/skia.gyp
|
| index 08d8351f80c1d059d1e8b7ce1c0093ccc73b2a90..343b07729bf2fc3a67e5fd3f26a3b96ccb10a078 100644
|
| --- a/skia/skia.gyp
|
| +++ b/skia/skia.gyp
|
| @@ -789,6 +789,13 @@
|
| '../third_party/skia/include/core/SkTypes.h',
|
| ],
|
| 'conditions': [
|
| + ['order_profiling != 0', {
|
| + 'target_conditions' : [
|
| + ['_toolset=="target"', {
|
| + 'cflags!': [ '-finstrument-functions' ],
|
| + }],
|
| + ],
|
| + }],
|
| # For POSIX platforms, prefer the Mutex implementation provided by Skia
|
| # since it does not generate static initializers.
|
| [ 'OS == "android" or OS == "linux" or OS == "mac"', {
|
| @@ -1088,6 +1095,13 @@
|
| '../third_party/skia/src/core',
|
| ],
|
| 'conditions': [
|
| + ['order_profiling != 0', {
|
| + 'target_conditions' : [
|
| + ['_toolset=="target"', {
|
| + 'cflags!': [ '-finstrument-functions' ],
|
| + }],
|
| + ],
|
| + }],
|
| [ 'os_posix == 1 and OS != "mac" and OS != "android" and target_arch != "arm"', {
|
| 'cflags': [
|
| '-msse2',
|
| @@ -1116,6 +1130,13 @@
|
| },
|
| { # arm
|
| 'conditions': [
|
| + ['order_profiling != 0', {
|
| + 'target_conditions' : [
|
| + ['_toolset=="target"', {
|
| + 'cflags!': [ '-finstrument-functions' ],
|
| + }],
|
| + ],
|
| + }],
|
| [ 'armv7 == 1', {
|
| 'defines': [
|
| '__ARM_ARCH__=7',
|
| @@ -1194,6 +1215,13 @@
|
| '-mssse3',
|
| ],
|
| }],
|
| + ['order_profiling != 0', {
|
| + 'target_conditions' : [
|
| + ['_toolset=="target"', {
|
| + 'cflags!': [ '-finstrument-functions' ],
|
| + }],
|
| + ],
|
| + }],
|
| [ 'OS == "mac"', {
|
| 'xcode_settings': {
|
| 'GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS': 'YES',
|
|
|