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

Unified Diff: build/android/increase_size_for_speed.gypi

Issue 1289623006: build: On Android, disable LTO for specific targets only when targeting GCC. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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
Index: build/android/increase_size_for_speed.gypi
diff --git a/build/android/increase_size_for_speed.gypi b/build/android/increase_size_for_speed.gypi
index 48d17f5f19c1423873274d10f96c153dcd5426b5..c5600b1b1a8d2f3de1eddbf0ba7dc753c76fc45c 100644
--- a/build/android/increase_size_for_speed.gypi
+++ b/build/android/increase_size_for_speed.gypi
@@ -18,17 +18,17 @@
'cflags!': ['-Os'],
'cflags': ['-O2'],
}],
- # Do not merge -Os and -O2 in LTO.
+ # Do not merge -Os and -O2 in GCC LTO.
# LTO merges all optimization options at link-time. -O2 takes
# precedence over -Os. Avoid using LTO simultaneously
# on -Os and -O2 parts for that reason.
- ['OS=="android" and use_lto==1', {
+ ['OS=="android" and clang==0 and use_lto==1', {
'cflags!': [
'-flto',
'-ffat-lto-objects',
],
}],
- ['OS=="android" and use_lto_o2==1', {
+ ['OS=="android" and clang==0 and use_lto_o2==1', {
'cflags': [
'-flto',
'-ffat-lto-objects',

Powered by Google App Engine
This is Rietveld 408576698