Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Unified Diff: tools/android_link.py

Issue 539573003: Adds support for building arm64 Android. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/signal_handler_android.cc ('k') | tools/build.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/android_link.py
===================================================================
--- tools/android_link.py (revision 39843)
+++ tools/android_link.py (working copy)
@@ -7,8 +7,8 @@
"""
This script performs the final link step for Android NDK executables.
Usage:
-./android_link {arm,ia32} {executable,library,shared_library} {host,target}
- [linker args]
+./android_link {arm,arm64,ia32} {executable,library,shared_library}
+ {host,target} [linker args]
"""
import os
@@ -48,8 +48,9 @@
link_args = sys.argv[4:]
# Check arguments.
- if target_arch not in ['arm', 'ia32']:
- raise Exception(sys.argv[0] + " first argument must be 'arm' or 'ia32'")
+ if target_arch not in ['arm', 'arm64', 'ia32']:
+ raise Exception(sys.argv[0] +
+ " first argument must be 'arm', 'arm64', or 'ia32'")
if link_type not in ['executable', 'library', 'shared_library']:
raise Exception(sys.argv[0] +
" second argument must be 'executable' or 'library'")
@@ -76,6 +77,8 @@
# Set up the directory of the Android NDK cross-compiler toolchain.
toolchain_arch = 'arm-linux-androideabi-4.6'
+ if target_arch == 'arm64':
+ toolchain_arch = 'aarch64-linux-android-4.9'
if target_arch == 'ia32':
toolchain_arch = 'x86-4.6'
toolchain_dir = 'linux-x86_64'
@@ -86,12 +89,17 @@
# Set up the path to the linker executable.
android_linker = os.path.join(android_toolchain, 'arm-linux-androideabi-g++')
+ if target_arch == 'arm64':
+ android_linker = os.path.join(
+ android_toolchain, 'aarch64-linux-android-c++')
if target_arch == 'ia32':
android_linker = os.path.join(android_toolchain, 'i686-linux-android-g++')
# Grab the path to libgcc.a, which we must explicitly add to the link,
# by invoking the cross-compiler with the -print-libgcc-file-name flag.
android_gcc = os.path.join(android_toolchain, 'arm-linux-androideabi-gcc')
+ if target_arch == 'arm64':
+ android_gcc = os.path.join(android_toolchain, 'aarch64-linux-android-gcc')
if target_arch == 'ia32':
android_gcc = os.path.join(android_toolchain, 'i686-linux-android-gcc')
android_libgcc = subprocess.check_output(
@@ -101,6 +109,9 @@
# Android specific system includes and libraries.
android_ndk_sysroot = os.path.join(android_ndk_root,
'platforms', 'android-14', 'arch-arm')
+ if target_arch == 'arm64':
+ android_ndk_sysroot = os.path.join(android_ndk_root,
+ 'platforms', 'android-L', 'arch-arm64')
if target_arch == 'ia32':
android_ndk_sysroot = os.path.join(android_ndk_root,
'platforms', 'android-14', 'arch-x86')
« no previous file with comments | « runtime/vm/signal_handler_android.cc ('k') | tools/build.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698