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

trunk/src/build/common.gypi

Index: trunk/src/build/common.gypi
===================================================================
--- trunk/src/build/common.gypi	(revision 273246)
+++ trunk/src/build/common.gypi	(working copy)
@@ -1458,13 +1458,7 @@
         'conditions': [
           ['OS=="android"', {
             # We directly set the gcc versions since we know what we use.
-            'conditions': [
-              ['target_arch=="x64" or target_arch=="arm64"', {
-                'gcc_version%': 48,
-              }, {
-                'gcc_version%': 46,
-              }],
-            ],
+            'gcc_version%': 48,
           }, {
             'gcc_version%': '<!pymod_do_main(compiler_version target compiler)',
           }],
@@ -1611,7 +1605,7 @@
               'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-x86/gdbserver/gdbserver',
               'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-14/arch-x86',
               'android_ndk_lib_dir%': 'usr/lib',
-              'android_toolchain%': '<(android_ndk_root)/toolchains/x86-4.6/prebuilt/<(host_os)-<(android_host_arch)/bin',
+              'android_toolchain%': '<(android_ndk_root)/toolchains/x86-4.8/prebuilt/<(host_os)-<(android_host_arch)/bin',
             }],
             ['target_arch == "x64"', {
               'android_app_abi%': 'x86_64',
@@ -1632,7 +1626,7 @@
               'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-arm/gdbserver/gdbserver',
               'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-14/arch-arm',
               'android_ndk_lib_dir%': 'usr/lib',
-              'android_toolchain%': '<(android_ndk_root)/toolchains/arm-linux-androideabi-4.6/prebuilt/<(host_os)-<(android_host_arch)/bin',
+              'android_toolchain%': '<(android_ndk_root)/toolchains/arm-linux-androideabi-4.8/prebuilt/<(host_os)-<(android_host_arch)/bin',
             }],
             ['target_arch == "arm64"', {
               'android_app_abi%': 'arm64-v8a',
@@ -1647,7 +1641,7 @@
               'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-mips/gdbserver/gdbserver',
               'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-14/arch-mips',
               'android_ndk_lib_dir%': 'usr/lib',
-              'android_toolchain%': '<(android_ndk_root)/toolchains/mipsel-linux-android-4.6/prebuilt/<(host_os)-<(android_host_arch)/bin',
+              'android_toolchain%': '<(android_ndk_root)/toolchains/mipsel-linux-android-4.8/prebuilt/<(host_os)-<(android_host_arch)/bin',
             }],
           ],
         },
@@ -2129,7 +2123,7 @@
       }],
       ['arm_version==7 and android_webview_build==0', {
         'arm_arch%': 'armv7-a',
-        'arm_tune%': '',
+        'arm_tune%': 'generic-armv7-a',
         'conditions': [
           ['arm_neon==1', {
             'arm_fpu%': 'neon',
@@ -3555,7 +3549,7 @@
                     # Most of the following flags are derived from what Android
                     # uses by default when building for arm, reference for which
                     # can be found in the following file in the Android NDK:
-                    # toolchains/arm-linux-androideabi-4.4.3/setup.mk
+                    # toolchains/arm-linux-androideabi-4.8/setup.mk
                     'cflags': [
                       # The tree-sra optimization (scalar replacement for
                       # aggregates enabling subsequent optimizations) leads to
@@ -3563,6 +3557,15 @@
                       # compiler (r5-r7). This can be verified using
                       # webkit_unit_tests' WTF.Checked_int8_t test.
                       '-fno-tree-sra',
+                      # 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',
                       '-Wno-psabi',
                     ],
                     # Android now supports .relro sections properly.
@@ -3598,6 +3601,12 @@
                           '-mthumb-interwork',
                           '-finline-limit=64',
                           '-fno-tree-sra',
+                          '-fno-partial-inlining',
+                          '-fno-early-inlining',
+                          '-fno-tree-copy-prop',
+                          '-fno-tree-loop-optimize',
+                          '-fno-move-loop-invariants',
+                          '-fno-caller-saves',
                           '-Wno-psabi',
                         ],
                         'cflags': [