Enable Android x64 build

build/common.gypi

Index: build/common.gypi
===================================================================
--- build/common.gypi	(revision 256167)
+++ build/common.gypi	(working copy)
@@ -792,10 +792,10 @@
           'test_isolation_mode%': 'noop',
         }],
         # Whether Android ARM or x86 build uses OpenMAX DL FFT.
-        ['OS=="android" and ((target_arch=="arm" and arm_version >= 7) or target_arch=="ia32") and android_webview_build==0', {
-          # Currently only supported on Android ARMv7+, or ia32
+        ['OS=="android" and ((target_arch=="arm" and arm_version >= 7) or target_arch=="ia32" or target_arch=="x64") and android_webview_build==0', {
+          # Currently only supported on Android ARMv7+, ia32 or x64
           # without webview.  When enabled, this will also enable
-          # WebAudio support on Android ARM and ia32.  Default is
+          # WebAudio support on Android ARM, ia32 and x64.  Default is
           # enabled.  Whether WebAudio is actually available depends
           # on runtime settings and flags.
           'use_openmax_dl_fft%': 1,
@@ -1301,7 +1301,13 @@
         'conditions': [
           ['OS=="android"', {
             # We directly set the gcc_version since we know what we use.
-            'gcc_version%': 46,
+            'conditions': [
+              ['target_arch=="x64"', {
+                'gcc_version%': 48,
+	      }, {
+                'gcc_version%': 46,
+	      }],
+	    ],

[rmcilroy, 2014/03/12 19:27:30]

replace tabs with spaces

           }, {
             'gcc_version%': '<!(python <(DEPTH)/build/compiler_version.py)',
           }],
@@ -1427,6 +1433,12 @@
               'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-14/arch-x86',
               'android_toolchain%': '<(android_ndk_root)/toolchains/x86-4.6/prebuilt/<(host_os)-<(android_host_arch)/bin',
             }],
+            ['target_arch == "x64"', {
+              'android_app_abi%': 'x86_64',
+              'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-x86_64/gdbserver/gdbserver',
+              'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-19/arch-x86_64',
+              'android_toolchain%': '<(android_ndk_root)/toolchains/x86_64-4.8/prebuilt/<(host_os)-<(android_host_arch)/bin',
+            }],
             ['target_arch=="arm"', {
               'conditions': [
                 ['arm_version<7', {
@@ -1736,7 +1748,7 @@
       ['use_titlecase_in_grd_files==1', {
         'grit_defines': ['-D', 'use_titlecase'],
       }],
-      ['OS=="android" and target_arch=="ia32"', {
+      ['OS=="android" and (target_arch=="ia32" or target_arch=="x64")', {
         # WebAudio on Android/x86 is disabled by default, unlike
         # everywhere else, so use appropriate message.
         'grit_defines': ['-D', 'use_webaudio_enable_message'],
@@ -3259,6 +3271,30 @@
               }],
             ],
           }],
+          ['target_arch=="x64"', {
+            'target_conditions': [
+              ['_toolset=="target"', {
+                'conditions': [
+                  # Use gold linker for Android x64 target.
+                  ['OS=="android"', {
+                    'cflags': [
+                      '-fuse-ld=gold',
+                    ],
+                    'ldflags': [
+                      '-fuse-ld=gold',
+                    ],
+                  }],
+                ],
+                'cflags': [
+                  '-m64',
+                  '-march=x86-64',
+                ],
+                'ldflags': [
+                  '-m64',
+                ],
+              }],
+            ],
+          }],
           ['target_arch=="arm"', {
             'target_conditions': [
               ['_toolset=="target"', {
@@ -3892,6 +3928,16 @@
                       '-target x86-linux-androideabi',
                     ],
                   }],
+                  # Place holder for x64 support, not tested.
+                  # TODO: Enable clang support for Android x64. http://crbug.com/346626
+                  ['target_arch=="x64"', {
+                    'cflags': [
+                      '-target x86_64-linux-androideabi',
+                    ],
+                    'ldflags': [
+                      '-target x86_64-linux-androideabi',
+                    ],
+                  }],
                 ],
               }],
               ['asan==1', {
@@ -4005,7 +4051,6 @@
               ['_type=="executable"', {
                 'ldflags': [
                   '-Bdynamic',
-                  '-Wl,-dynamic-linker,/system/bin/linker',
                   '-Wl,--gc-sections',
                   '-Wl,-z,nocopyreloc',
                   # crtbegin_dynamic.o should be the last item in ldflags.