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

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: moved /base/cygprofile to /tools/cygprofile Created 8 years, 7 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 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',
« no previous file with comments | « media/media.gyp ('k') | third_party/libwebp/libwebp.gyp » ('j') | tools/cygprofile/cygprofile.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698