Make aapt and aidl paths flexible.

build/android/gyp/package_resources.py

 #!/usr/bin/env python
 #
 # Copyright 2014 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.
 
 # pylint: disable=C0301
 """Package resources into an apk.
 
 See https://android.googlesource.com/platform/tools/base/+/master/legacy/ant-tasks/src/main/java/com/android/ant/AaptExecTask.java
@@ skipping 53 matching lines @@
 
 def ParseArgs():
   """Parses command line options.
 
   Returns:
     An options object as from optparse.OptionsParser.parse_args()
   """
   parser = optparse.OptionParser()
   build_utils.AddDepfileOption(parser)
   parser.add_option('--android-sdk', help='path to the Android SDK folder')
-  parser.add_option('--android-sdk-tools',
-                    help='path to the Android SDK build tools folder')
+  parser.add_option('--aapt-path',
+                    help='path to the Android aapt tool')
 
   parser.add_option('--configuration-name',
                     help='Gyp\'s configuration name (Debug or Release).')
 
   parser.add_option('--android-manifest', help='AndroidManifest.xml path')
   parser.add_option('--version-code', help='Version code for apk.')
   parser.add_option('--version-name', help='Version name for apk.')
   parser.add_option(
       '--shared-resources',
       action='store_true',
@@ skipping 12 matching lines @@
 
   parser.add_option('--apk-path',
                     help='Path to output (partial) apk.')
 
   (options, args) = parser.parse_args()
 
   if args:
     parser.error('No positional arguments should be given.')
 
   # Check that required options have been provided.
-  required_options = ('android_sdk', 'android_sdk_tools', 'configuration_name',
+  required_options = ('android_sdk', 'aapt_path', 'configuration_name',
                       'android_manifest', 'version_code', 'version_name',
                       'apk_path')
 
   build_utils.CheckOptions(options, parser, required=required_options)
 
   return options
 
 
 def MoveImagesToNonMdpiFolders(res_root):
   """Move images from drawable-*-mdpi-* folders to drawable-* folders.
@@ skipping 61 matching lines @@
         if trigger in name and not 'mipmap-' in name:
           raise Exception(('Found density in main apk that should have been ' +
                            'put into a split: %s\nYou need to update ' +
                            'package_resources.py to include this new ' +
                            'config.') % name)
 
 
 def main():
   options = ParseArgs()
   android_jar = os.path.join(options.android_sdk, 'android.jar')
-  aapt = os.path.join(options.android_sdk_tools, 'aapt')
+  aapt = options.aapt_path
 
   with build_utils.TempDir() as temp_dir:
     package_command = [aapt,
                        'package',
                        '--version-code', options.version_code,
                        '--version-name', options.version_name,
                        '-M', options.android_manifest,
                        '--no-crunch',
                        '-f',
                        '--auto-add-overlay',
@@ skipping 35 matching lines @@
       RenameDensitySplits(options.apk_path)
 
     if options.depfile:
       build_utils.WriteDepfile(
           options.depfile,
           build_utils.GetPythonDependencies())
 
 
 if __name__ == '__main__':
   main()