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

Unified Diff: build/common.gypi

Issue 817653003: Update from https://crrev.com/309717 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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 | « build/android/findbugs_filter/findbugs_known_bugs.txt ('k') | build/get_landmines.py » ('j') | 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 0bc6c6ac71ddb7259e994bf19a66a8e54ecc8c34..d1492320f727797ac8f4fb5c39ea091aba0eacf6 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -4375,7 +4375,7 @@
}],
],
'conditions': [
- ['release_valgrind_build==0', {
+ ['release_valgrind_build==0 and order_profiling==0', {
'target_conditions': [
['_toolset=="target"', {
'ldflags': [
@@ -4674,7 +4674,7 @@
}],
],
}],
- ['target_arch == "arm"', {
+ ['target_arch == "arm" and order_profiling==0', {
'ldflags': [
# Enable identical code folding to reduce size.
'-Wl,--icf=safe',
« no previous file with comments | « build/android/findbugs_filter/findbugs_known_bugs.txt ('k') | build/get_landmines.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698