summaryrefslogtreecommitdiffstats
path: root/build/android/adb_install_apk.py
diff options
context:
space:
mode:
authorjbudorick <jbudorick@chromium.org>2015-12-04 06:27:43 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-04 14:28:57 +0000
commit0c2a94ab87e6351b924a19932442e85a8f786fa0 (patch)
treec6bb5b9b68b03883ee55e54d6a0f27b0731cab64 /build/android/adb_install_apk.py
parent5db2dfe090fe92cd03e101d8592c360eceb3ebe2 (diff)
downloadchromium_src-0c2a94ab87e6351b924a19932442e85a8f786fa0.zip
chromium_src-0c2a94ab87e6351b924a19932442e85a8f786fa0.tar.gz
chromium_src-0c2a94ab87e6351b924a19932442e85a8f786fa0.tar.bz2
[Android] Add a configurable environment for devil/. (RELAND 2)
This is a reland of https://codereview.chromium.org/1399273002 BUG=476719 Review URL: https://codereview.chromium.org/1416703003 Cr-Commit-Position: refs/heads/master@{#363204}
Diffstat (limited to 'build/android/adb_install_apk.py')
-rwxr-xr-xbuild/android/adb_install_apk.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/build/android/adb_install_apk.py b/build/android/adb_install_apk.py
index a816bd4..0914bc1 100755
--- a/build/android/adb_install_apk.py
+++ b/build/android/adb_install_apk.py
@@ -12,6 +12,8 @@ import logging
import os
import sys
+import devil_chromium
+
from devil.android import apk_helper
from devil.android import device_blacklist
from devil.android import device_errors
@@ -62,6 +64,8 @@ def main():
run_tests_helper.SetLogLevel(args.verbose)
constants.SetBuildType(args.build_type)
+ devil_chromium.Initialize(output_directory=constants.GetOutDirectory())
+
apk = args.apk_path or args.apk_name
if not apk.endswith('.apk'):
apk += '.apk'