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

Unified Diff: build/common.gypi

Issue 1458963005: build: Fix Clang build when passing order_profiling==1. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index c0832c44045c8fbce8082f1daf7dfab367827c06..573b5e35c583cccdcf60bfce8b4347a4e9c265bc 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -4558,8 +4558,16 @@
['order_profiling!=0 and OS=="android"', {
'target_conditions' : [
['_toolset=="target"', {
+ 'cflags': ['-finstrument-functions'],
+ 'defines': ['CYGPROFILE_INSTRUMENTATION'],
+ }],
+ ],
+ }],
+ # Clang doesn't understand -finstrument-functions-exclude-file-list=.
+ ['order_profiling!=0 and OS=="android" and clang==0', {
+ 'target_conditions' : [
+ ['_toolset=="target"', {
'cflags': [
- '-finstrument-functions',
# Allow mmx intrinsics to inline, so that the
# compiler can expand the intrinsics.
'-finstrument-functions-exclude-file-list=mmintrin.h',
@@ -4567,7 +4575,6 @@
# "third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.6/include/arm_neon.h:3426:3: error: argument must be a constant"
'-finstrument-functions-exclude-file-list=arm_neon.h',
],
- 'defines': ['CYGPROFILE_INSTRUMENTATION'],
}],
],
}],
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698