Commit c45dbc59 authored by qsr@chromium.org's avatar qsr@chromium.org

Never instrument the crazy linker.

We are not interested in computing an order file for the crazy linker. This CL ensures that we never try to instrument it.

R=mariakhomenko@chromium.org, pliard@chromium.org, thakis@chromium.org

Review URL: https://codereview.chromium.org/292123008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272967 0039d316-1c4b-4281-b951-d872f2087c98
parent 06bfeb15
...@@ -1415,6 +1415,10 @@ ...@@ -1415,6 +1415,10 @@
'sources': [ 'sources': [
'android/linker/linker_jni.cc', 'android/linker/linker_jni.cc',
], ],
# The crazy linker is never instrumented.
'cflags!': [
'-finstrument-functions',
],
'dependencies': [ 'dependencies': [
'<(android_ndk_root)/crazy_linker.gyp:crazy_linker', '<(android_ndk_root)/crazy_linker.gyp:crazy_linker',
], ],
......
...@@ -3918,7 +3918,9 @@ ...@@ -3918,7 +3918,9 @@
}], }],
['order_profiling!=0 and (chromeos==1 or OS=="linux" or OS=="android")', { ['order_profiling!=0 and (chromeos==1 or OS=="linux" or OS=="android")', {
'target_conditions' : [ 'target_conditions' : [
['_toolset=="target"', { # crazy_linker has an upstream gyp file we can't edit, and we
# don't want to instrument it.
['_toolset=="target" and _target_name!="crazy_linker"', {
'cflags': [ 'cflags': [
'-finstrument-functions', '-finstrument-functions',
# Allow mmx intrinsics to inline, so that the # Allow mmx intrinsics to inline, so that the
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment