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

Unified Diff: appengine/swarming/server/bot_archive.py

Issue 1306633002: Overhaul Android support and make Swarming bot use python-adb (Closed) Base URL: git@github.com:luci/luci-py.git@master
Patch Set: Fixes for error conditions Created 5 years, 4 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 | « no previous file | appengine/swarming/swarming_bot/adb » ('j') | appengine/swarming/swarming_bot/os_utilities.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: appengine/swarming/server/bot_archive.py
diff --git a/appengine/swarming/server/bot_archive.py b/appengine/swarming/server/bot_archive.py
index 29ed31646928dd81e7c131e24dfa826afd42eabb..85439e8580b654c90ef1187151d0389ced4fc9d2 100755
--- a/appengine/swarming/server/bot_archive.py
+++ b/appengine/swarming/server/bot_archive.py
@@ -144,6 +144,7 @@ FILES = (
'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',
@@ -162,6 +163,18 @@ FILES = (
'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):
@@ -171,6 +184,9 @@ def resolve_symlink(path):
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)):
« no previous file with comments | « no previous file | appengine/swarming/swarming_bot/adb » ('j') | appengine/swarming/swarming_bot/os_utilities.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698