Overhaul Android support and make Swarming bot use python-adb

appengine/swarming/server/bot_archive.py

 #!/usr/bin/env python
 # Copyright 2014 The Swarming Authors. All rights reserved.
 # Use of this source code is governed by the Apache v2.0 license that can be
 # found in the LICENSE file.
 
 """Generates the swarming_bot.zip archive for the bot.
 
 Unlike the other scripts, this file can be run stand-alone to generate a
 swarming_bot.zip so it doesn't import anything from the AppEngine SDK.
 
@@ skipping 126 matching lines @@
     'third_party/rsa/rsa/key.py',
     'third_party/rsa/rsa/parallel.py',
     'third_party/rsa/rsa/pem.py',
     'third_party/rsa/rsa/pkcs1.py',
     'third_party/rsa/rsa/prime.py',
     'third_party/rsa/rsa/randnum.py',
     'third_party/rsa/rsa/transform.py',
     'third_party/rsa/rsa/util.py',
     'third_party/rsa/rsa/varblock.py',
     'platforms/__init__.py',
+    'platforms/android.py',
     'platforms/gce.py',
     'platforms/linux.py',
     'platforms/osx.py',
     'platforms/posix.py',
     'platforms/win.py',
     'utils/__init__.py',
     'utils/cacert.pem',
     'utils/file_path.py',
     'utils/logging_utils.py',
     'utils/lru.py',
     'utils/net.py',
     'utils/oauth.py',
     'utils/on_error.py',
     'utils/subprocess42.py',
     'utils/threading_utils.py',
     'utils/tools.py',
     'utils/zip_package.py',
     'xsrf_client.py',
+
+    # TODO(maruel): Find a way to only include these on linux platforms but it's
+    # not that large so it is not a big deal.
+    'adb/__init__.py',
+    'adb/adb_commands.py',
+    'adb/adb_protocol.py',
+    'adb/common.py',
+    'adb/fastboot.py',
+    'adb/filesync_protocol.py',
+    'adb/usb_exceptions.py',
+    'libusb1.py',
+    'usb1.py',
 )
 
 def resolve_symlink(path):
   """Processes path containing symlink on Windows.
 
   This is needed to make ../swarming_bot/main_test.py pass on Windows because
   git on Windows renders symlinks as normal files.
   """
   if sys.platform != 'win32' or os.path.isfile(path):
+    # This means that symlinks to file will not be resolved properly. In our
+    # case this is fine because the only 2 instances of this issue are
+    # libusb1.py and usb1.py, which are only used on Ubuntu.
     return path
   parts = os.path.normpath(path).split(os.path.sep)
   for i in xrange(2, len(parts)):
     partial = os.path.sep.join(parts[:i])
     if os.path.isfile(partial):
       with open(partial) as f:
         link = f.read()
       assert '\n' not in link and link, link
       parts[i-1] = link
   return os.path.normpath(os.path.sep.join(parts))
@@ skipping 86 matching lines @@
   with open(os.path.join(swarming_bot_dir, 'bot_config.py'), 'rb') as f:
     additionals = {'bot_config.py': f.read()}
   with open(zip_file, 'wb') as f:
     f.write(
         get_swarming_bot_zip(swarming_bot_dir, config['server'], additionals))
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())