A working version of dart on Android.

runtime/tools/create_snapshot_bin.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 """Script to create snapshot bin file."""
 
 import getopt
 import optparse
@@ skipping 41 matching lines @@
     return False
   if not options.output_bin:
     sys.stderr.write('--output_bin not specified\n')
     return False
   if options.abi and not options.target_os == 'android':
     sys.stderr.write('--abi requires --target_os android\n')
     return False
   return True
 
 
-def RunAdb(device, command):

[Søren Gjesse, 2013/05/29 09:20:42]

Nice!

-  """Run a raw adb command."""
-  return utils.RunCommand(["adb", "-s", device] + command)
-
-
-def RunAdbShell(device, command):
-  RunAdb(device, ['shell'] + command)
-
-
-def RunOnAndroid(options):
-  outputBin = options.output_bin
-
-  android_workspace = os.getenv("ANDROID_DART", "/data/local/dart")
-  android_outputBin = join(android_workspace, basename(outputBin))
-
-  executable = options.executable
-  android_executable = join(android_workspace, basename(executable))
-
-  filesToPush = [] # (src, dest)
-  filesToPull = [] # (src, dest)
-
-  # Setup arguments to the snapshot generator binary.
-  script_args = [android_executable]
-
-  # First setup the snapshot output filename.
-  filesToPull.append((android_outputBin, outputBin))
-  script_args.append(''.join([ "--snapshot=", android_outputBin]))
-
-  # We don't know what source files are needed to fully satisfy a dart script,
-  # so we can't support the general case of url mapping or script inclusion.
-  if options.url_mapping:
-    raise Exception("--url_mapping is not supported when building for Android")
-
-  if options.script:
-    raise Exception("--script is not supported when building for Android")
-
-  filesToPush.append((executable, android_executable))
-
-  abi = options.abi or 'x86'
-  # We know we're run in the runtime directory, and we know the relative path
-  # to the tools we want to execute:
-  command = ["tools/android_finder.py", "--bootstrap", "--abi", abi]
-  if VERBOSE:
-    command += ['--verbose']
-  device = utils.RunCommand(command, errStream=sys.stderr)
-
-  if device == None:
-    raise Exception("Could not find Android device for abi %s" % abi)
-
-  device = device.strip()
-
-  if VERBOSE:
-    sys.write.stderr('Using Android device %s for abi %s' % (device, abi))
-
-  RunAdbShell(device, ["mkdir", android_workspace])
-
-  try:
-    if VERBOSE:
-      sys.write.stderr('pushing files to %s' % device)
-    for src, dest in filesToPush:
-      RunAdb(device, ["push", src, dest])
-    if VERBOSE:
-      sys.write.stderr('running snapshot generator')
-    RunAdbShell(device, script_args)
-    if VERBOSE:
-      sys.write.stderr('retrieving snapshot')
-    for src, dest in filesToPull:
-      RunAdb(device, ["pull", src, dest])
-  finally:
-    if VERBOSE:
-      sys.write.stderr('cleaning intermediate files')
-    for src, dest in filesToPush:
-      RunAdbShell(device, ["rm", dest])
-    for src, dest in filesToPull:
-      RunAdbShell(device, ["rm", src])
-
-
 def Main():
   # Parse options.
   parser = BuildOptions()
   (options, args) = parser.parse_args()
   if not ProcessOptions(options):
     parser.print_help()
     return 1
 
   # If there are additional arguments, report error and exit.
   if args:
     parser.print_help()
     return 1
 
   # Setup arguments to the snapshot generator binary.
   script_args = ["--error_on_malformed_type"]
 
   # First setup the snapshot output filename.
   script_args.append(''.join([ "--snapshot=", options.output_bin ]))
 
   # Next setup all url mapping options specified.
   for url_arg in options.url_mapping:
     url_mapping_argument = ''.join(["--url_mapping=", url_arg ])
     script_args.append(url_mapping_argument)
 
   # Finally append the script name if one is specified.
   if options.script:
     script_args.append(options.script)
 
   # Construct command line to execute the snapshot generator binary and invoke.
-  if options.target_os == 'android':
-    RunOnAndroid(options)
-  else:
-    command = [ options.executable ] + script_args
-    try:
-      utils.RunCommand(command, outStream=sys.stderr, errStream=sys.stderr,
-                       verbose=options.verbose, printErrorInfo=True)
-    except Exception as e:
-      return -1
+  command = [ options.executable ] + script_args
+  try:
+    utils.RunCommand(command, outStream=sys.stderr, errStream=sys.stderr,
+                     verbose=options.verbose, printErrorInfo=True)
+  except Exception as e:
+    return -1
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(Main())