| Index: skia/skia.gyp
|
| diff --git a/skia/skia.gyp b/skia/skia.gyp
|
| index bfaa6981363eb5ceb1a78db19594aad6c9598cc2..eef7326f54e4fe50ac5a6b0514769b83906a6a1e 100644
|
| --- a/skia/skia.gyp
|
| +++ b/skia/skia.gyp
|
| @@ -775,6 +775,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"', {
|
| @@ -1070,6 +1077,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',
|
| @@ -1093,6 +1107,13 @@
|
| },
|
| { # arm
|
| 'conditions': [
|
| + ['order_profiling != 0', {
|
| + 'target_conditions' : [
|
| + ['_toolset=="target"', {
|
| + 'cflags!': [ '-finstrument-functions' ],
|
| + }],
|
| + ],
|
| + }],
|
| [ 'armv7 == 1', {
|
| 'defines': [
|
| '__ARM_ARCH__=7',
|
| @@ -1171,6 +1192,13 @@
|
| '-mssse3',
|
| ],
|
| }],
|
| + ['order_profiling != 0', {
|
| + 'target_conditions' : [
|
| + ['_toolset=="target"', {
|
| + 'cflags!': [ '-finstrument-functions' ],
|
| + }],
|
| + ],
|
| + }],
|
| # TODO: when ninja/make understand
|
| # GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS, set that to YES here
|
| # instead of stepping on OTHER_CFLAGS.
|
|
|