Enable Android x64 build

build/common.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
@@ skipping 774 matching lines @@
         # supported.
         # NOTE: The check for disable_nacl==0 and component=="static_library"
         # can't be used here because these variables are not defined yet, but it
         # is still not supported.
         ['OS!="ios" and OS!="android" and chromeos==0', {
           'test_isolation_mode%': 'check',
         }, {
           '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,
         }, {
           'use_openmax_dl_fft%': 0,
         }],
         ['OS=="win" or OS=="linux"', {
             'enable_mdns%' : 1,
         }],
 
@@ skipping 482 matching lines @@
     # away once the chrome and blink interfaces are in sync
     'enable_new_gamepad_api%': 1,
 
     'conditions': [
       # The version of GCC in use, set later in platforms that use GCC and have
       # not explicitly chosen to build with clang. Currently, this means all
       # platforms except Windows, Mac and iOS.
       # TODO(glider): set clang to 1 earlier for ASan and TSan builds so that
       # it takes effect here.
       ['os_posix==1 and OS!="mac" and OS!="ios" and clang==0 and asan==0 and lsan==0 and tsan==0 and msan==0', {
-        'conditions': [
-          ['OS=="android"', {
-            # We directly set the gcc_version since we know what we use.
-            'gcc_version%': 46,
-          }, {
-            'gcc_version%': '<!(python <(DEPTH)/build/compiler_version.py)',
-          }],
-        ],
+        'gcc_version%': '<!(python <(DEPTH)/build/compiler_version.py)',

[Torne, 2014/03/11 11:15:35]

Is this correct? We're forcing gcc 4.6 at present..

[rmcilroy, 2014/03/11 11:42:19]

I think x64 requires 4.8 - is that right Zhenyu?   We should keep other Android
arches at 4.6 for now though (fdegans@ is investigating whether we can move to
4.8 without size regressions right now).  Could you make this 4.6 or 4.8
depending on architecture here please (assuming x64 actually needs 4.8).

[Zhenyu Liang, 2014/03/12 10:27:23]

Yeah, we are using gcc 4.8 for x64 porting.
The change means it will determine the gcc version of android toolchain later
rather than assume it. Here, the gcc_version is the version of host compiler.

[rmcilroy, 2014/03/12 11:04:08]

Is there a reason you cannot do:
    ['OS=="android"', {
        ['target_arch=="x64"', {
           'gcc_version%': 48,	
        }, {
           'gcc_version%': 46,	
        }],
    }, {
    ....

As I suggested above?  I think this would be more obvious what it was doing.

[Zhenyu Liang, 2014/03/12 11:30:53]

I had tried this way initially. It doesn't work. GYP complains "target_arch is
not defined". It seems that target_arch is not defined in the stage parsing
variables.

[rmcilroy, 2014/03/12 15:09:53]

Are you sure?  When I try this myself it seems to works with no mention of
target_arch not being defined.  What is the setup you are using to build chrome?
 Are you using envsetup.sh and android_gyp?

[Zhenyu Liang, 2014/03/12 18:46:32]

Sorry, I misremembered that _toolset is what I tried.
target_arch is OK. Updated.

       }, {
         'gcc_version%': 0,
       }],
       ['OS=="win" and "<!(python <(DEPTH)/build/dir_exists.py <(windows_sdk_default_path))"=="True"', {
         'windows_sdk_path%': '<(windows_sdk_default_path)',
       }, {
         'windows_sdk_path%': 'C:/Program Files (x86)/Windows Kits/8.0',
       }],
       ['OS=="win" and "<!(python <(DEPTH)/build/dir_exists.py <(directx_sdk_default_path))"=="True"', {
         'directx_sdk_path%': '<(directx_sdk_default_path)',
@@ skipping 101 matching lines @@
           # Android API level 14 is ICS (Android 4.0) which is the minimum
           # platform requirement for Chrome on Android, we use it for native
           # code compilation.
           'conditions': [
             ['target_arch == "ia32"', {
               'android_app_abi%': 'x86',
               'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-x86/gdbserver/gdbserver',
               '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', {
                   'android_app_abi%': 'armeabi',
                 }, {
                   'android_app_abi%': 'armeabi-v7a',
                 }],
               ],
               'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-arm/gdbserver/gdbserver',
               'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-14/arch-arm',
@@ skipping 26 matching lines @@
         'android_stlport_include': '<(android_stlport_root)/stlport',
         'android_stlport_libs_dir': '<(android_stlport_root)/libs/<(android_app_abi)',
         'host_os%': '<(host_os)',
 
         # Location of the "strip" binary, used by both gyp and scripts.
         'android_strip%' : '<!(/bin/echo -n <(android_toolchain)/*-strip)',
 
         # Location of the "readelf" binary.
         'android_readelf%' : '<!(/bin/echo -n <(android_toolchain)/*-readelf)',
 
+        # GCC version of Android toolchain
+        'gcc_version%': '<!(CXX=<(android_toolchain)/*-g++ python <(DEPTH)/build/compiler_version.py)',

[rmcilroy, 2014/03/11 11:42:19]

Why is this required?  Isn't it done above?

[Zhenyu Liang, 2014/03/12 10:27:23]

It determines the gcc version of android toolchain here (by using the script
with CXX environment), and overwrite the gcc_version.

+
         # Determines whether we should optimize JNI generation at the cost of
         # breaking assumptions in the build system that when inputs have changed
         # the outputs should always change as well.  This is meant purely for
         # developer builds, to avoid spurious re-linking of native files.
         'optimize_jni_generation%': 0,
 
         # Always uses openssl.
         'use_openssl%': 1,
 
         'proprietary_codecs%': '<(proprietary_codecs)',
@@ skipping 243 matching lines @@
       }],
       ['image_loader_extension==1', {
         'grit_defines': ['-D', 'image_loader_extension'],
       }],
       ['remoting==1', {
         'grit_defines': ['-D', 'remoting'],
       }],
       ['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'],
       }],
       ['use_third_party_translations==1', {
         'grit_defines': ['-D', 'use_third_party_translations'],
         'locales': [
           'ast', 'bs', 'ca@valencia', 'en-AU', 'eo', 'eu', 'gl', 'hy', 'ia',
           'ka', 'ku', 'kw', 'ms', 'ug'
         ],
@@ skipping 1502 matching lines @@
                 'cflags': [
                   '-m32',
                   '-mmmx',
                 ],
                 'ldflags': [
                   '-m32',
                 ],
               }],
             ],
           }],
+          ['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"', {
                 'cflags_cc': [
                   # The codesourcery arm-2009q3 toolchain warns at that the ABI
                   # has changed whenever it encounters a varargs function. This
                   # silences those warnings, as they are not helpful and
                   # clutter legitimate warnings.
                   '-Wno-abi',
                 ],
@@ skipping 613 matching lines @@
                     ],
                   }],
                   ['target_arch=="ia32"', {
                     'cflags': [
                       '-target x86-linux-androideabi',
                     ],
                     'ldflags': [
                       '-target x86-linux-androideabi',
                     ],
                   }],
+                  # Place holder for x64 support, not tested.

[rmcilroy, 2014/03/11 11:42:19]

Add a todo associated with a bug here please (so that the todo can be removed
once it's tested).

+                  ['target_arch=="x64"', {
+                    'cflags': [
+                      '-target x86_64-linux-androideabi',
+                    ],
+                    'ldflags': [
+                      '-target x86_64-linux-androideabi',
+                    ],
+                  }],
                 ],
               }],
               ['asan==1', {
                 'cflags': [
                   # Android build relies on -Wl,--gc-sections removing
                   # unreachable code. ASan instrumentation for globals inhibits
                   # this and results in a library with unresolvable relocations.
                   # TODO(eugenis): find a way to reenable this.
                   '-mllvm -asan-globals=0',
                 ],
@@ skipping 93 matching lines @@
                 ],
                 'cflags': [
                   '-fno-stack-protector',
                 ],
               }],
             ],
             'target_conditions': [
               ['_type=="executable"', {
                 'ldflags': [
                   '-Bdynamic',
-                  '-Wl,-dynamic-linker,/system/bin/linker',

[rmcilroy, 2014/03/11 11:42:19]

This should probably be ok, but have you tested this being removed on older
32bit platforms (e.g. ICS) to make sure it works without the explicit linker
attribute?

[Zhenyu Liang, 2014/03/12 10:27:23]

Yes, I had tried with the original ndk in third_party/. gcc version 4.6 can
generate proper .interp section. I think we can remove this line safely.

Quick check:
% strings arm-linux-androideabi-gcc | grep /linker

                   '-Wl,--gc-sections',
                   '-Wl,-z,nocopyreloc',
                   # crtbegin_dynamic.o should be the last item in ldflags.
                   '<(android_ndk_lib)/crtbegin_dynamic.o',
                 ],
                 'libraries': [
                   # crtend_android.o needs to be the last item in libraries.
                   # Do not add any libraries after this!
                   '<(android_ndk_lib)/crtend_android.o',
                 ],
@@ skipping 1033 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }