Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(415)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: mojo/tools/mopy/android.py

Issue 1138933004: Fix apptest builds and runner on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup. Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/tools/apptest_runner.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/tools/mopy/android.py
diff --git a/mojo/tools/mopy/android.py b/mojo/tools/mopy/android.py
index 3fcb1ca229b6dfe3b0ebb89226ec62bfa09782e2..9735a64fed10954af3ff98970458040e39f53e6c 100644
--- a/mojo/tools/mopy/android.py
+++ b/mojo/tools/mopy/android.py
@@ -331,10 +331,9 @@ class AndroidShell(object):
atexit.register(self.StopShell)
extra_shell_args = []
- if origin:
sky 2015/05/12 19:39:53 I added this code because mandoline doesn't specif
msw 2015/05/12 20:53:07 OK, now it respects origin=None and starts a serve
- origin_url = origin if origin else self._StartHttpServerForDirectory(
- self.local_dir, DEFAULT_BASE_PORT if fixed_port else 0)
- extra_shell_args.append("--origin=" + origin_url)
+ origin_url = origin if origin else self._StartHttpServerForDirectory(
+ self.local_dir, DEFAULT_BASE_PORT if fixed_port else 0)
+ extra_shell_args.append("--origin=" + origin_url)
return extra_shell_args
« no previous file with comments | « mojo/tools/apptest_runner.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698