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

Unified Diff: build/common.gypi

Issue 1366433004: Remove unnecessary crazy_linker order_profiling logic (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 months 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 | « base/android/linker/BUILD.gn ('k') | 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 6ff25506a2b3063abbe9d6a0a114de89a05364c9..8ba0caba84ec0044155293088758745da2543dbb 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -4590,23 +4590,17 @@
}],
['order_profiling!=0 and OS=="android"', {
'target_conditions' : [
- # 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"', {
+ ['_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'],
}],
],
}],
« no previous file with comments | « base/android/linker/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698