diff options
| author | Dan Beam <dbeam@chromium.org> | 2015-05-01 10:59:49 -0700 |
|---|---|---|
| committer | Dan Beam <dbeam@chromium.org> | 2015-05-01 18:01:12 +0000 |
| commit | 565d7e3762e2f7c667d87a2766cae3435d846e00 (patch) | |
| tree | 10a2d56b9e616221376cc41dba0bed9158b51c55 /mojo | |
| parent | b1b09b7962fe68bfb5df60a68e96b6b2f9bd1dcc (diff) | |
| download | chromium_src-565d7e3762e2f7c667d87a2766cae3435d846e00.zip chromium_src-565d7e3762e2f7c667d87a2766cae3435d846e00.tar.gz chromium_src-565d7e3762e2f7c667d87a2766cae3435d846e00.tar.bz2 | |
Revert "Add Mandoline.apk, reusing a bunch of stuff from MojoRunner.apk to begin with."
This reverts commit dbadf07493f72cfdc90dc28b066e70121d15f4ff.
Revert "Rename mandoline_all -> mandoline."
This reverts commit 827acb62b9181ac3b45ba866e059e6bf590b4e29.
TBR=ben@chromium.org
BUG=
Review URL: https://codereview.chromium.org/1117263003
Cr-Commit-Position: refs/heads/master@{#327936}
Diffstat (limited to 'mojo')
| -rwxr-xr-x | mojo/tools/android_mojo_shell.py | 3 | ||||
| -rw-r--r-- | mojo/tools/mopy/config.py | 8 | ||||
| -rw-r--r-- | mojo/tools/mopy/paths.py | 2 |
3 files changed, 3 insertions, 10 deletions
diff --git a/mojo/tools/android_mojo_shell.py b/mojo/tools/android_mojo_shell.py index 020fe1f..ca86672 100755 --- a/mojo/tools/android_mojo_shell.py +++ b/mojo/tools/android_mojo_shell.py @@ -31,8 +31,7 @@ def main(): config = Config(target_os=Config.OS_ANDROID, target_cpu=launcher_args.target_cpu, - is_debug=launcher_args.debug, - apk_name="MojoRunner.apk") + is_debug=launcher_args.debug) paths = Paths(config) shell = AndroidShell(paths.target_mojo_shell_path, paths.build_dir, paths.adb_path, launcher_args.target_device) diff --git a/mojo/tools/mopy/config.py b/mojo/tools/mopy/config.py index ba43bd0..796a328 100644 --- a/mojo/tools/mopy/config.py +++ b/mojo/tools/mopy/config.py @@ -39,7 +39,7 @@ class Config(object): def __init__(self, target_os=None, target_cpu=None, is_debug=True, is_clang=None, sanitizer=None, dcheck_always_on=False, - apk_name="MojoRunner.apk", **kwargs): + **kwargs): """Constructs a Config with key-value pairs specified via keyword arguments. If target_os is not specified, it will be set to the host OS.""" @@ -68,7 +68,6 @@ class Config(object): self.values["is_clang"] = is_clang self.values["sanitizer"] = sanitizer self.values["dcheck_always_on"] = dcheck_always_on - self.values["apk_name"] = apk_name self.values.update(kwargs) @@ -118,11 +117,6 @@ class Config(object): return self.values["dcheck_always_on"] @property - def apk_name(self): - """Name of the APK file to run""" - return self.values["apk_name"] - - @property def is_clang(self): """Should use clang?""" return self.values["is_clang"] diff --git a/mojo/tools/mopy/paths.py b/mojo/tools/mopy/paths.py index 751629a..508305c 100644 --- a/mojo/tools/mopy/paths.py +++ b/mojo/tools/mopy/paths.py @@ -36,7 +36,7 @@ class Paths(object): if config and config.target_os == Config.OS_ANDROID: self.target_mojo_shell_path = os.path.join(self.build_dir, "apks", - config.apk_name) + "MojoRunner.apk") else: self.target_mojo_shell_path = self.mojo_shell_path else: |