diff options
| author | Andrew Shu <talklittle@gmail.com> | 2018-03-24 15:44:57 -0700 |
|---|---|---|
| committer | Andrew Shu <talklittle@gmail.com> | 2018-03-25 10:40:26 -0700 |
| commit | a631cb6b475b18e77bd6ca9db7ffe2cd94c3bde7 (patch) | |
| tree | 220bb4698b316f8e199ad9cce367fd1162104088 /python/servo/command_base.py | |
| parent | 782d4d4af61b7c9f60dfb494f8a5bfb6407945d2 (diff) | |
| download | servo-a631cb6b475b18e77bd6ca9db7ffe2cd94c3bde7.tar.gz servo-a631cb6b475b18e77bd6ca9db7ffe2cd94c3bde7.zip | |
mach: android install/run: infer adb path from SDK dir
Diffstat (limited to 'python/servo/command_base.py')
| -rw-r--r-- | python/servo/command_base.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py index a200fa05f24..881e454d097 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -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" |