android: Don't require aapt to be on the path during builds and tests.

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 37 matching lines @@
   metadata = GetNewMetadata(device, apk_package)
   if not metadata:
     raise Exception('APK install failed unexpectedly.')
 
   with open(metadata_path, 'w') as outfile:
     outfile.write(metadata)
 
 
 def main(argv):
   parser = optparse.OptionParser()
+  parser.add_option('--android-sdk-tools',
+      help='path to the Android SDK build tools folder')
   parser.add_option('--apk-path',
       help='Path to .apk to install.')
   parser.add_option('--install-record',
       help='Path to install record (touched only when APK is installed).')
   parser.add_option('--build-device-configuration',
       help='Path to build device configuration.')
   parser.add_option('--stamp',
       help='Path to touch on success.')
   parser.add_option('--configuration-name',
       help='The build CONFIGURATION_NAME')
   options, _ = parser.parse_args()
 
   device = build_device.GetBuildDeviceFromPath(
       options.build_device_configuration)
   if not device:
     return
 
   constants.SetBuildType(options.configuration_name)
 
   serial_number = device.GetSerialNumber()
-  apk_package = apk_helper.GetPackageName(options.apk_path)
+  apk_package = apk_helper.GetPackageName(options.android_sdk_tools,

[frankf, 2014/02/14 21:59:19]

I don't see the benefit of passing in the android-sdk-tools from gyp compared to
the added complexity of piping it through everywhere. Why not just use the
constant value? aapt usage here shouldn't affect build behavior.

[Nico, 2014/02/14 22:16:56]

Yes, I'm pretty on the fence here too. I went with this approach since
a) The other place calling aapt (
https://code.google.com/p/chromium/codesearch#chromium/src/build/android/gyp/...
) did it like this
b) Using the gyp variables as much as possible seems like a good thing

If you think just always using constants.ANDROID_SDK_TOOLS in apk_helper and
passing it in is preferable, I'll gladly change to that, up to you.

+                                          options.apk_path)
 
   metadata_path = '%s.%s.device.time.stamp' % (options.apk_path, serial_number)
 
   # If the APK on the device does not match the one that was last installed by
   # the build, then the APK has to be installed (regardless of the md5 record).
   force_install = HasInstallMetadataChanged(device, apk_package, metadata_path)
 
   def Install():
     device.Install(options.apk_path, reinstall=True)
     RecordInstallMetadata(device, apk_package, metadata_path)
     build_utils.Touch(options.install_record)
 
 
   record_path = '%s.%s.md5.stamp' % (options.apk_path, serial_number)
   md5_check.CallAndRecordIfStale(
       Install,
       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(sys.argv))