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

build/android/gyp/create_device_library_links.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.
 
 """Creates symlinks to native libraries for an APK.
 
 The native libraries should have previously been pushed to the device (in
 options.target_dir). This script then creates links in an apk's lib/ folder to
@@ skipping 41 matching lines @@
   with open(options.script_host_path, 'w') as scriptfile:
     scriptfile.write(script)
 
 
 def TriggerSymlinkScript(options):
   device = build_device.GetBuildDeviceFromPath(
       options.build_device_configuration)
   if not device:
     return
 
-  apk_package = apk_helper.GetPackageName(options.apk)
+  apk_package = apk_helper.GetPackageName(options.android_sdk_tools,
+                                          options.apk_path)
   apk_libraries_dir = '/data/data/%s/lib' % apk_package
 
   device_dir = os.path.dirname(options.script_device_path)
   mkdir_cmd = ('if [ ! -e %(dir)s ]; then mkdir -p %(dir)s; fi ' %
       { 'dir': device_dir })
   RunShellCommand(device, mkdir_cmd)
   device.PushIfNeeded(options.script_host_path, options.script_device_path)
 
   trigger_cmd = (
       'APK_LIBRARIES_DIR=%(apk_libraries_dir)s; '
       'STRIPPED_LIBRARIES_DIR=%(target_dir)s; '
       '. %(script_device_path)s'
       ) % {
           'apk_libraries_dir': apk_libraries_dir,
           'target_dir': options.target_dir,
           'script_device_path': options.script_device_path
           }
   RunShellCommand(device, trigger_cmd)
 
 
 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', help='Path to the apk.')
   parser.add_option('--script-host-path',
       help='Path on the host for the symlink script.')
   parser.add_option('--script-device-path',
       help='Path on the device to push the created symlink script.')
   parser.add_option('--libraries-json',
       help='Path to the json list of native libraries.')
   parser.add_option('--target-dir',
       help='Device directory that contains the target libraries for symlinks.')
   parser.add_option('--stamp', help='Path to touch on success.')
@@ skipping 10 matching lines @@
 
   CreateSymlinkScript(options)
   TriggerSymlinkScript(options)
 
   if options.stamp:
     build_utils.Touch(options.stamp)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))