Index: skia/skia.gyp |
diff --git a/skia/skia.gyp b/skia/skia.gyp |
index 471774a641ed4655f2af3ab5793f762ec7565599..c5fbac0d5ffb3dc926124ae0b8b985da6c86e66a 100644 |
--- a/skia/skia.gyp |
+++ b/skia/skia.gyp |
@@ -734,6 +734,13 @@ |
'../third_party/skia/include/core/SkTypes.h', |
], |
'conditions': [ |
+ ['order_profiling != 0', { |
+ 'target_conditions' : [ |
+ ['_toolset=="target"', { |
+ 'cflags!': [ '-finstrument-functions' ], |
+ }], |
+ ], |
+ }], |
[ 'OS != "android"', { |
'sources/': [ |
['exclude', '_android\\.(cc|cpp)$'], |
@@ -992,6 +999,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', |
@@ -1011,6 +1025,13 @@ |
}, |
{ # arm |
'conditions': [ |
+ ['order_profiling != 0', { |
+ 'target_conditions' : [ |
+ ['_toolset=="target"', { |
+ 'cflags!': [ '-finstrument-functions' ], |
+ }], |
+ ], |
+ }], |
[ 'armv7 == 1', { |
'defines': [ |
'__ARM_ARCH__=7', |