Update GetNewMetadata function to be more forgiving for directory names.

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.
 
 """
 
@@ skipping 13 matching lines @@
 from pylib.utils import apk_helper
 
 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.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)
+  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
 
 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)
@@ skipping 51 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())