Chromium Code Reviews| Index: build/common.gypi |
| diff --git a/build/common.gypi b/build/common.gypi |
| index 6ff25506a2b3063abbe9d6a0a114de89a05364c9..9c7e15b755747785f4666a6ed0fd1044c14962f0 100644 |
| --- a/build/common.gypi |
| +++ b/build/common.gypi |
| @@ -4592,21 +4592,17 @@ |
| 'target_conditions' : [ |
| # crazy_linker has an upstream gyp file we can't edit, and we |
| # don't want to instrument it. |
|
pasko
2015/09/23 09:54:20
is this comment no longer true?
The proper test o
pkotwicz
2015/09/23 18:00:54
I removed the comment. Thank you for noticing! We
|
| - ['_toolset=="target" and _target_name!="crazy_linker"', { |
| + ['_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', |
| - ], |
| - 'defines': ['CYGPROFILE_INSTRUMENTATION'], |
| - }], |
| - ['_toolset=="target"', { |
| - 'cflags': [ |
| # Avoids errors with current NDK: |
| # "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,SaturatedArithmeticARM.h', |
| ], |
| + 'defines': ['CYGPROFILE_INSTRUMENTATION'], |
| }], |
| ], |
| }], |