X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fbuild%2Fandroid%2Fincrease_size_for_speed.gypi;h=4081cd71bfc1f59e58814c344faab2a625349fd0;hb=1afa4dd80ef85af7c90efaea6959db1d92330844;hp=f5f2d6263322bd53270e1bc38348619e800113dc;hpb=90762837333c13ccf56f2ad88e4481fc71e8d281;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/build/android/increase_size_for_speed.gypi b/src/build/android/increase_size_for_speed.gypi
index f5f2d62..4081cd7 100644
--- a/src/build/android/increase_size_for_speed.gypi
+++ b/src/build/android/increase_size_for_speed.gypi
@@ -18,6 +18,22 @@
               'cflags!': ['-Os'],
               'cflags': ['-O2'],
             }],
+            # Do not merge -Os and -O2 in 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.
+            ['use_lto==1', {
+              'cflags!': [
+                '-flto',
+                '-ffat-lto-objects',
+              ],
+            }],
+            ['use_lto_o2==1', {
+              'cflags': [
+                '-flto',
+                '-ffat-lto-objects',
+              ],
+            }],
           ],
         }],
       ],