summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryzshen <yzshen@chromium.org>2015-07-24 15:54:55 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-24 22:55:52 +0000
commitb9deae6d85d920cdd405b287ac44323060740fc0 (patch)
tree89ef27011fa89d180167559356655766cb3c36ed
parentc880227e376b5d825a22524334a251c35d2d7bd4 (diff)
downloadchromium_src-b9deae6d85d920cdd405b287ac44323060740fc0.zip
chromium_src-b9deae6d85d920cdd405b287ac44323060740fc0.tar.gz
chromium_src-b9deae6d85d920cdd405b287ac44323060740fc0.tar.bz2
Support --build-dir commandline flag for {run,install}_mandoline.py
BUG=None Review URL: https://codereview.chromium.org/1257793004 Cr-Commit-Position: refs/heads/master@{#340364}
-rwxr-xr-xmandoline/tools/android/install_mandoline.py4
-rwxr-xr-xmandoline/tools/android/run_mandoline.py4
2 files changed, 6 insertions, 2 deletions
diff --git a/mandoline/tools/android/install_mandoline.py b/mandoline/tools/android/install_mandoline.py
index 4fd7703..0f9387e 100755
--- a/mandoline/tools/android/install_mandoline.py
+++ b/mandoline/tools/android/install_mandoline.py
@@ -27,12 +27,14 @@ def main():
default=True, action='store_true')
debug_group.add_argument('--release', help='Release build', default=False,
dest='debug', action='store_false')
+ parser.add_argument('--build-dir', help='Build directory')
parser.add_argument('--target-cpu', help='CPU architecture to run for.',
choices=['x64', 'x86', 'arm'], default='arm')
parser.add_argument('--device', help='Serial number of the target device.')
runner_args, args = parser.parse_known_args()
- config = Config(target_os=Config.OS_ANDROID,
+ config = Config(build_dir=runner_args.build_dir,
+ target_os=Config.OS_ANDROID,
target_cpu=runner_args.target_cpu,
is_debug=runner_args.debug,
apk_name='Mandoline.apk')
diff --git a/mandoline/tools/android/run_mandoline.py b/mandoline/tools/android/run_mandoline.py
index c06e008..cf9139d 100755
--- a/mandoline/tools/android/run_mandoline.py
+++ b/mandoline/tools/android/run_mandoline.py
@@ -55,6 +55,7 @@ def main():
default=True, action='store_true')
debug_group.add_argument('--release', help='Release build', default=False,
dest='debug', action='store_false')
+ parser.add_argument('--build-dir', help='Build directory')
parser.add_argument('--target-cpu', help='CPU architecture to run for.',
choices=['x64', 'x86', 'arm'], default='arm')
parser.add_argument('--device', help='Serial number of the target device.')
@@ -62,7 +63,8 @@ def main():
default=False, action='store_true')
runner_args, args = parser.parse_known_args()
- config = Config(target_os=Config.OS_ANDROID,
+ config = Config(build_dir=runner_args.build_dir,
+ target_os=Config.OS_ANDROID,
target_cpu=runner_args.target_cpu,
is_debug=runner_args.debug,
apk_name='Mandoline.apk')