[build/android] Switch hand-rolled 'ls' to StatDirectory

build/android/gyp/apk_install.py

 #!/usr/bin/env python
 #
 # 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.
 
 """Installs an APK.
 
 """
 
 import optparse
 import os
-import re
 import sys
 
 from util import build_device
 from util import build_utils
 from util import md5_check
 
 BUILD_ANDROID_DIR = os.path.abspath(
     os.path.join(os.path.dirname(__file__), '..'))
 sys.path.append(BUILD_ANDROID_DIR)
 
 import devil_chromium
 from devil.android import apk_helper
 from pylib import constants
 
 
-def GetNewMetadata(device, apk_package):
-  """Gets the metadata on the device for the apk_package apk."""
-  output = device.RunShellCommand('ls -l /data/app/')
-  # Matches lines like:
-  # -rw-r--r-- system   system    7376582 2013-04-19 16:34 \
-  # org.chromium.chrome.apk
-  # -rw-r--r-- system   system    7376582 2013-04-19 16:34 \
-  # org.chromium.chrome-1.apk
-  apk_matcher = lambda s: re.match('.*%s(-[0-9]*)?(.apk)?$' % apk_package, s)
-  matches = filter(apk_matcher, output)
-  return matches[0] if matches else None

[perezju, 2016/06/15 14:54:45]

Replaced below with device.GetInstallMetadata(apk_package, refresh=True) to
avoid code duplication.

-
 def HasInstallMetadataChanged(device, apk_package, metadata_path):
   """Checks if the metadata on the device for apk_package has changed."""
   if not os.path.exists(metadata_path):
     return True
 
-  with open(metadata_path, 'r') as expected_file:
-    return expected_file.read() != device.GetInstallMetadata(apk_package)
+  try:
+    expected_metadata = build_utils.ReadJson(metadata_path)
+  except ValueError:  # File is not json encoded.
+    return True

[perezju, 2016/06/15 14:54:45]

Give some tolerance for old files (with the output of "ls -l") lying around. We
force install in those cases.

[agrieve, 2016/06/15 17:25:24]

One step even better would be to change this file to use DeviceUtil's built-in
caching (device.DumpCacheData()). Not as easy as enabling a flag, but you can
see how it's used here:
https://cs.chromium.org/chromium/src/build/android/incremental_install/instal...

[perezju, 2016/06/16 09:31:28]

Had a quick look, but the change would be a bit more involved and require some
larger refactoring. The metadata stored here is only for a specific apk, while
DumpCacheData is for the whole device. So prefer to leave it as is for now.

+
+  return expected_metadata != device.GetInstallMetadata(apk_package)
 
 
 def RecordInstallMetadata(device, apk_package, metadata_path):
   """Records the metadata from the device for apk_package."""
-  metadata = GetNewMetadata(device, apk_package)
+  metadata = device.GetInstallMetadata(apk_package, refresh=True)
   if not metadata:
     raise Exception('APK install failed unexpectedly.')
 
-  with open(metadata_path, 'w') as outfile:
-    outfile.write(metadata)
+  build_utils.WriteJson(metadata, metadata_path)
 
 
 def main():
   parser = optparse.OptionParser()
   parser.add_option('--apk-path',
       help='Path to .apk to install.')
   parser.add_option('--split-apk-path',
       help='Path to .apk splits (can specify multiple times, causes '
       '--install-multiple to be used.',
       action='append')
@@ skipping 48 matching lines @@
       record_path=record_path,
       input_paths=[options.apk_path],
       force=force_install)
 
   if options.stamp:
     build_utils.Touch(options.stamp)
 
 
 if __name__ == '__main__':
   sys.exit(main())