Version 1.1.0-dev.5.2

dart/tools/android_link.py

 #!/usr/bin/env python
 
 # Copyright (c) 2012 The Dart Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """
 This script performs the final link step for Android NDK executables.
 Usage:
 ./android_link {arm,ia32} {executable,library,shared_library} {host,target}
@@ skipping 61 matching lines @@
   CheckDirExists(THIRD_PARTY_ROOT, 'third party tools');
   android_tools = os.path.join(THIRD_PARTY_ROOT, 'android_tools')
   CheckDirExists(android_tools, 'Android tools')
   android_ndk_root = os.path.join(android_tools, 'ndk')
   CheckDirExists(android_ndk_root, 'Android NDK')
 
   # Set up the directory of the Android NDK cross-compiler toolchain.
   toolchain_arch = 'arm-linux-androideabi-4.6'
   if target_arch == 'ia32':
     toolchain_arch = 'x86-4.6'
-  toolchain_dir = 'linux-x86'
+  toolchain_dir = 'linux-x86_64'
   android_toolchain = os.path.join(android_ndk_root,
       'toolchains', toolchain_arch,
       'prebuilt', toolchain_dir, 'bin')
   CheckDirExists(android_toolchain, 'Android toolchain')
 
   # Set up the path to the linker executable.
   android_linker = os.path.join(android_toolchain, 'arm-linux-androideabi-g++')
   if target_arch == 'ia32':
     android_linker = os.path.join(android_toolchain, 'i686-linux-android-g++')
 
@@ skipping 33 matching lines @@
 
     link_args.insert(0, android_linker)
   else:
     link_args.extend(['-ldl', '-lrt'])
     link_args.insert(0, 'g++')
 
   sys.exit(execute(link_args))
 
 if __name__ == '__main__':
   main()