eliott/servo
1
0
Fork 0
mirror of https://github.com/servo/servo synced 2026-05-09 08:32:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

mach: android install/run: infer adb path from SDK dir

Browse Source
This commit is contained in:
Andrew Shu
2018-03-24 15:44:57 -07:00
parent 782d4d4af6
commit a631cb6b47
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
python/servo/command_base.py
View File

@@ -626,6 +626,13 @@ class CommandBase(object):
def android_aar_dir(self):
return path.join(self.context.topdir, "target", "android_aar")
def android_adb_path(self, env):
if "ANDROID_SDK" in env:
sdk_adb = path.join(env["ANDROID_SDK"], "platform-tools", "adb")
if path.exists(sdk_adb):
return sdk_adb
return "adb"
def handle_android_target(self, target):
if target == "arm-linux-androideabi":
self.config["android"]["platform"] = "android-18"