[Android] More old_interface conversions in build/android/.

build/android/gyp/util/build_device.py

 # Copyright 2013 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.
 
 """ A simple device interface for build steps.
 
 """
 
 import logging
 import os
 import re
 import sys
 
 from util import build_utils
 
 BUILD_ANDROID_DIR = os.path.join(os.path.dirname(__file__), '..', '..')
 sys.path.append(BUILD_ANDROID_DIR)
 
 from pylib import android_commands
 from pylib.device import device_errors
 from pylib.device import device_utils
 
 GetAttachedDevices = android_commands.GetAttachedDevices
 
 
 class BuildDevice(object):

[perezju, 2015/04/17 09:16:43]

not sure if this falls under our scope, but maybe add a TODO for completely
removing this object? Almost seems like clients should just be using DeviceUtils
directly.

[jbudorick, 2015/04/17 13:32:24]

This is a question for +cjhopman.

[cjhopman, 2015/04/17 18:44:37]

So, it's complicated.

This is used for a bunch of actions in gyp/gn. For builds to be correct, those
actions need to correctly specify all of their inputs. In the case of a python
script like this, that means that they should essentially specify all of the
python files that are imported.

For that reason, we really, really try not to use things outside of
build/android/gyp (because it's impractical to expect people to update a whole
bunch of lists of inputs in gyp when changing imports in build/android/pylib).

In this case, we know that our inputs are incorrect. A change to the bits of
device_utils that we use could definitely lead to our builds flakily
failing/succeeding. Not using device_utils directly sort of makes it easier to
restrict ourselves to more stable bits of that interface.

Now, in GN, we actually don't really have that problem. GN actions support
writing a depfile (basically it allows the action itself to specify its inputs
when it is run). All of our python actions then write the list of imported files
into their depfile.

Recently, gyp has also gotten support for depfiles on actions, but we haven't
taken the time to go back and actually use that.

Once all of our actions use depfiles (either because we don't use gyp anymore or
because the gyp actions are all updated) we can freely use whatever things we
want.

So, yes we should be using DeviceUtils directly, but... it's complicated.

   def __init__(self, configuration):
     self.id = configuration['id']
     self.description = configuration['description']
     self.install_metadata = configuration['install_metadata']
     self.device = device_utils.DeviceUtils(self.id)
 
   def RunShellCommand(self, *args, **kwargs):
     return self.device.RunShellCommand(*args, **kwargs)
 
   def PushChangedFiles(self, *args, **kwargs):
     return self.device.PushChangedFiles(*args, **kwargs)
 
   def GetSerialNumber(self):
     return self.id
 
   def Install(self, *args, **kwargs):
-    return self.device.old_interface.Install(*args, **kwargs)
+    return self.device.Install(*args, **kwargs)
 
   def GetInstallMetadata(self, apk_package):
     """Gets the metadata on the device for the apk_package apk."""
     # Matches lines like:
     # -rw-r--r-- system   system    7376582 2013-04-19 16:34 \
     #   org.chromium.chrome.shell.apk
     # -rw-r--r-- system   system    7376582 2013-04-19 16:34 \
     #   org.chromium.chrome.shell-1.apk
     apk_matcher = lambda s: re.match('.*%s(-[0-9]*)?.apk$' % apk_package, s)
     matches = filter(apk_matcher, self.install_metadata)
@@ skipping 42 matching lines @@
   assert len(configurations) == 1
   return BuildDevice(configurations[0])
 
 
 def GetBuildDeviceFromPath(path):
   configurations = ReadConfigurations(path)
   if len(configurations) > 0:
     return GetBuildDevice(ReadConfigurations(path))
   return None