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

mojo/tools/mopy/android.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import atexit
 import datetime
 import email.utils
 import hashlib
 import itertools
 import json
@@ skipping 341 matching lines @@
            '-S',
            '-a', 'android.intent.action.VIEW',
            '-n', '%s/%s.MojoShellActivity' % (self.target_package,
                                               MOJO_SHELL_PACKAGE_NAME)])
 
     parameters = []
     if stdout or on_application_stop:
       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)
     parameters += other_parameters
     parameters += self._StartHttpServerForOriginMappings(map_parameters)
 
     if parameters:
       encodedParameters = json.dumps(parameters)
       cmd += ['--es', 'encodedParameters', encodedParameters]
 
@@ skipping 21 matching lines @@
 
     Returns the process responsible for reading the logs.
     """
     logcat = subprocess.Popen(self._CreateADBCommand([
                                'logcat',
                                '-s',
                                ' '.join(LOGCAT_TAGS)]),
                               stdout=sys.stdout)
     atexit.register(_ExitIfNeeded, logcat)
     return logcat