Changes android.py to wait longer with --wait-for-debugger

mojo/tools/mopy/android.py

Index: mojo/tools/mopy/android.py
diff --git a/mojo/tools/mopy/android.py b/mojo/tools/mopy/android.py
index bc38c444a387ccee80b5241f2662a076d9247894..2354c8e5f9138fa1f63283ce97786cf21d4ecf0b 100644
--- a/mojo/tools/mopy/android.py
+++ b/mojo/tools/mopy/android.py
@@ -359,7 +359,11 @@ class AndroidShell(object):
       subprocess.check_call(self._CreateADBCommand(
           ['shell', 'rm', '-f', STDOUT_PIPE]))
       parameters.append('--fifo-path=%s' % STDOUT_PIPE)
-      self._ReadFifo(STDOUT_PIPE, stdout, on_application_stop)
+      max_attempts = 5
+      if '--wait-for-debugger' in arguments:

[msw, 2015/05/14 00:21:33]

q: should we remove that switch from |arguments| after this?

[sky, 2015/05/14 16:07:14]

What do you mean?

[msw, 2015/05/14 16:52:14]

I'm wondering if --wait-for-debugger should be passed through to the application
or not, it probably doesn't matter.

[sky, 2015/05/14 16:54:33]

The shell definitely needs to see --wait-for-debugger, otherwise it's not going
to wait.

[msw, 2015/05/14 17:04:35]

Woops, I guess it was a dumb question. I just didn't see our use of the literal
or kWaitForDebugger on codesearch.

+        max_attempts = 200
+      self._ReadFifo(STDOUT_PIPE, stdout, on_application_stop,
+                     max_attempts=max_attempts)
 
     # Extract map-origin arguments.
     map_parameters, other_parameters = _Split(arguments, _IsMapOrigin)