Make blimp work on K

blimp/tools/client_engine_integration.py

 #!/usr/bin/env python
 # Copyright 2016 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.
 
 """Blimp Client + Engine integration test system
 
    Set up Client and Engine
    Set up Forward to connect machine host with client device.
    Start Engine and run blimp on Android Client.
@@ skipping 16 matching lines @@
 DEVIL_PATH = os.path.join(SRC_PATH, 'third_party', 'catapult',
                           'devil')
 
 if DEVIL_PATH not in sys.path:
   sys.path.append(DEVIL_PATH)
 
 from devil.android import device_blacklist
 from devil.android import device_utils
 from devil.android import forwarder
 from devil.android.sdk import intent
+from devil.android.sdk import version_codes
 from devil.utils import cmd_helper
 
 _CLIENT_TOKEN_PATH = posixpath.join('/', 'data', 'data',
                                     'org.chromium.blimp',
                                     'blimp_client_token')
 _TOKEN_FILE_PATH = os.path.join(SRC_PATH, 'blimp', 'test', 'data',
                                 'test_client_token')
 PORT_PATTERN = re.compile(r'.*Engine port #: (\d+)')
 ARGS_JSON_FILE = 'blimp_script_args.json'
 
@@ skipping 21 matching lines @@
     optional_url: (str) URL to navigate to.
   """
   run_client_intent = intent.Intent(
       action='android.intent.action.VIEW',
       package='org.chromium.blimp',
       activity='org.chromium.blimp.BlimpRendererActivity',
       data=optional_url)
   device.StartActivity(run_client_intent, blocking=True)
 
 
-def RunEngine(output_linux_directory, token_file_path):
+def RunEngine(output_linux_directory, token_file_path, device):
   """Start running engine
 
   Args:
     output_linux_directory: (str) Path to the root linux build directory.
     token_file_path: (str) Path to the client auth token file.
 
   Returns:
     port: (str) Engine port number generated by engine session.
   """
   port = '0'
   blimp_engine_app = os.path.join(output_linux_directory,
                                   'blimp_engine_app')
+
+  sub_dir = "marshmallow"
+  if device.build_version_sdk == version_codes.KITKAT:
+    sub_dir = "kitkat"
   blimp_fonts_path = os.path.join(output_linux_directory, 'gen',
-                                  'third_party', 'blimp_fonts')
+                                  'third_party', 'blimp_fonts',
+                                  'font_bundle', sub_dir)
+
   run_engine_cmd = [
       blimp_engine_app +
       ' --android-fonts-path=' + blimp_fonts_path +
       ' --blimp-client-token-path=' + token_file_path +
       ' --enable-logging=stderr' +
       ' -v=0' +
       ' --vmodule="blimp*=1"']
   p = subprocess.Popen(run_engine_cmd, shell=True,
                        stdout=subprocess.PIPE,
                        stderr=subprocess.STDOUT)
@@ skipping 60 matching lines @@
   json_args = argparse.Namespace()
   for k in args.__dict__:
     if not k == "func":
       setattr(json_args, k, args.__dict__[k])
   json_object = {'args': json_args}
   device.EnableRoot()
   host_device_tuples = [(_TOKEN_FILE_PATH, _CLIENT_TOKEN_PATH)]
   device.PushChangedFiles(host_device_tuples)
 
   port_number, engine_process = RunEngine(
-      args.output_linux_directory, _TOKEN_FILE_PATH)
+      args.output_linux_directory, _TOKEN_FILE_PATH, device)
   json_object['port_number'] = port_number
   json_object['pid'] = engine_process.pid
   logging.info("Engine port number: %s", port_number)
   logging.info("Engine running PID: %d", engine_process.pid)
 
   if engine_process.poll() is None:
     try:
       port_pairs = [(port_number, port_number)]
       forwarder.Forwarder.Map(port_pairs, device)
       SetCommandFlag(device, args.engine_ip, port_number)
@@ skipping 125 matching lines @@
                else None)
   device = device_utils.DeviceUtils.HealthyDevices(
       blacklist=blacklist, device_arg=serial)[0]
 
   args.func(args, json_file_path, device)
 
 
 if __name__ == '__main__':
   main()