Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(504)

Unified Diff: skia/skia.gyp

Issue 8770054: Tool to log the execution of Chrome. Initial add. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed review comments Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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.
« build/common.gypi ('K') | « media/media.gyp ('k') | third_party/libwebp/libwebp.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698