| 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'],
|
| }],
|
| ],
|
| }],
|
|
|