Chromium Code Reviews| Index: build/config/compiler/BUILD.gn |
| diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn |
| index ea96f2eee206ee8e718cf728f63ed8fcbe2b5929..8d591d0fe3a46212139f464c56c800614fdcf84d 100644 |
| --- a/build/config/compiler/BUILD.gn |
| +++ b/build/config/compiler/BUILD.gn |
| @@ -190,8 +190,11 @@ config("compiler") { |
| } |
| # Linker warnings. |
| - if (!(is_chromeos && current_cpu == "arm") && !is_mac && !is_ios) { |
| + if (!(is_chromeos && current_cpu == "arm") && |
| + !(is_android && order_profiling) && !is_mac && !is_ios) { |
| # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580 |
| + # TODO(azarchs): Fix link errors when linking with order_profiling=1 |
| + # crbug.com/485542 |
| ldflags += [ "-Wl,--fatal-warnings" ] |
| } |
| @@ -637,6 +640,10 @@ config("compiler") { |
| # to say that it does. Define them here instead. |
| defines += [ "HAVE_SYS_UIO_H" ] |
| + if (order_profiling) { |
| + defines += [ "CYGPROFILE_INSTRUMENTATION=1" ] |
|
agrieve
2015/09/23 19:20:48
Would be better to put this in the default_finstru
pkotwicz
2015/09/23 19:57:08
I moved this to the finstrument_functions config a
|
| + } |
| + |
| # Use gold for Android for most CPU architectures. |
| if (current_cpu == "x86" || current_cpu == "x64" || current_cpu == "arm") { |
| ldflags += [ "-fuse-ld=gold" ] |