Revert 273188 "Revert 271207 "Changed android toolchain to use G..."

trunk/src/build/config/compiler/BUILD.gn

Index: trunk/src/build/config/compiler/BUILD.gn
===================================================================
--- trunk/src/build/config/compiler/BUILD.gn	(revision 273246)
+++ trunk/src/build/config/compiler/BUILD.gn	(working copy)
@@ -219,8 +219,19 @@
       "-fno-short-enums",
     ]
     if (!is_clang) {
-      # Clang doesn't support this one.
-      cflags += [ "-finline-limit=64" ]
+      # Clang doesn't support these flags.
+      cflags += [
+        "-finline-limit=64",
+        # The following 6 options are disabled to save on
+        # binary size in gcc 4.8.
+        # TODO(fdegans) Reevaluate when we upgrade GCC.
+        "-fno-partial-inlining",
+        "-fno-early-inlining",
+        "-fno-tree-copy-prop",
+        "-fno-tree-loop-optimize",
+        "-fno-move-loop-invariants",
+        "-fno-caller-saves",
+      ]
     }
     if (is_android_webview_build) {
       # Android predefines this as 1; undefine it here so Chromium can redefine
@@ -618,6 +629,15 @@
         "-Wno-sign-promo",
       ]
     }
+
+    if (gcc_version >= 48) {
+      # Don't warn about the "typedef 'foo' locally defined but not used"
+      # for gcc 4.8.
+      # TODO: remove this flag once all builds work. See crbug.com/227506
+      cflags += [
+        "-Wno-unused-local-typedefs",
+      ]
+    }
   }
 }
 
@@ -776,4 +796,3 @@
     cflags = [ "-g0" ]
   }
 }
-