Mojo: Send Android args in a string array, not JSON.

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 itertools
-import json
 import logging
 import os
 import shutil
 import signal
 import subprocess
 import sys
 import tempfile
 import threading
 import time
 import urlparse
@@ skipping 231 matching lines @@
       arguments += ['--wait-for-debugger']
       logcat_process = self.ShowLogs(stdout=subprocess.PIPE)
 
     fifo_path = "/data/data/%s/stdout.fifo" % self.target_package
     subprocess.check_call(self._CreateADBCommand(
         ['shell', 'rm', '-f', fifo_path]))
     arguments.append('--fifo-path=%s' % fifo_path)
     max_attempts = 200 if '--wait-for-debugger' in arguments else 5
     self._ReadFifo(fifo_path, stdout, on_application_stop, max_attempts)
 
-    # Extract map-origin arguments.
+    # Extract map-origin args and add the extras array with commas escaped.
     parameters = [a for a in arguments if not a.startswith(MAPPING_PREFIX)]
     map_parameters = [a for a in arguments if a.startswith(MAPPING_PREFIX)]
     parameters += self._StartHttpServerForOriginMappings(map_parameters)
-
+    parameters = [p.replace(',', '\,') for p in parameters]
     if parameters:
-      cmd += ['--es', 'encodedParameters', json.dumps(parameters)]
+      cmd += ['--esa', 'org.chromium.mojo.shell.extras', ','.join(parameters)]
 
     atexit.register(self.StopShell)
     with open(os.devnull, 'w') as devnull:
       cmd_process = subprocess.Popen(cmd, stdout=devnull)
       if logcat_process:
         self._WaitForProcessIdAndStartGdb(logcat_process)
       cmd_process.wait()
 
   def StopShell(self):
     """Stops the mojo shell."""
@@ skipping 55 matching lines @@
   files_to_link = {
     'html_viewer.mojo': ['libhtml_viewer', 'html_viewer_library.so'],
     'libmandoline_runner.so': ['mandoline_runner'],
   }
   for android_name, so_path in files_to_link.iteritems():
     src = os.path.join(build_dir, *so_path)
     if not os.path.isfile(src):
       print 'Expected file not found', src
       sys.exit(-1)
     os.symlink(src, os.path.join(dest_dir, android_name))