diff options
| author | craigdh@chromium.org <craigdh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-10 18:29:03 +0000 |
|---|---|---|
| committer | craigdh@chromium.org <craigdh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-10 18:29:03 +0000 |
| commit | fae5c5b0408c7549414e7dc0b29ef2adbf5e6f01 (patch) | |
| tree | 88720f1a6c182bfa773d583403c3aa091878b3e1 /build/android/adb_install_apk.py | |
| parent | 9336bf6a88daadc6a97163241fb01337aaa03e0c (diff) | |
| download | chromium_src-fae5c5b0408c7549414e7dc0b29ef2adbf5e6f01.zip chromium_src-fae5c5b0408c7549414e7dc0b29ef2adbf5e6f01.tar.gz chromium_src-fae5c5b0408c7549414e7dc0b29ef2adbf5e6f01.tar.bz2 | |
[android] Relands: Adds constants.GetBuildDirectory() and converts test scripts to use it.
BUG=260494
TEST=None
NOTRY=True
Review URL: https://chromiumcodereview.appspot.com/23494039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222313 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/android/adb_install_apk.py')
| -rwxr-xr-x | build/android/adb_install_apk.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build/android/adb_install_apk.py b/build/android/adb_install_apk.py index 36adb79..adad48b 100755 --- a/build/android/adb_install_apk.py +++ b/build/android/adb_install_apk.py @@ -38,9 +38,8 @@ def ValidateInstallAPKOption(option_parser, options): if not options.apk: option_parser.error('--apk is mandatory.') if not os.path.exists(options.apk): - options.apk = os.path.join(constants.DIR_SOURCE_ROOT, - 'out', options.build_type, - 'apks', options.apk) + options.apk = os.path.join(constants.GetOutDirectory(), 'apks', + options.apk) def _InstallApk(args): @@ -54,6 +53,7 @@ def main(argv): parser = optparse.OptionParser() AddInstallAPKOption(parser) options, args = parser.parse_args(argv) + constants.SetBuildType(options.build_type) ValidateInstallAPKOption(parser, options) if len(args) > 1: raise Exception('Error: Unknown argument:', args[1:]) |