Build changes for updating Android SDK to 4.3.

build/android/gyp/process_resources.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2012 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.
 
 """Process Android library resources to generate R.java and crunched images."""
 
 import optparse
 import os
 import shlex
 
 from util import build_utils
 
 def ParseArgs():
   """Parses command line options.
 
   Returns:
     An options object as from optparse.OptionsParser.parse_args()
   """
   parser = optparse.OptionParser()
   parser.add_option('--android-sdk', help='path to the Android SDK folder')
   parser.add_option('--android-sdk-tools',
-                    help='path to the Android SDK platform tools folder')
+                    help='path to the Android SDK build tools folder')
   parser.add_option('--R-dir', help='directory to hold generated R.java')
   parser.add_option('--res-dirs',
                     help='directories containing resources to be packaged')
   parser.add_option('--crunch-input-dir',
                     help='directory containing images to be crunched')
   parser.add_option('--crunch-output-dir',
                     help='directory to hold crunched resources')
   parser.add_option('--non-constant-id', action='store_true')
   parser.add_option('--custom-package', help='Java package for R.java')
   parser.add_option('--android-manifest', help='AndroidManifest.xml path')
   parser.add_option('--stamp', help='File to touch on success')
 
   # This is part of a temporary fix for crbug.com/177552.
   # TODO(newt): remove this once crbug.com/177552 is fixed in ninja.
   parser.add_option('--ignore', help='this argument is ignored')
   (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', 'R_dir', 'res_dirs',
-                      'crunch_input_dir', 'crunch_output_dir')
+  required_options = ('android_sdk', 'android_sdk_tools', 'R_dir',
+                      'res_dirs', 'crunch_input_dir', 'crunch_output_dir')
   build_utils.CheckOptions(options, parser, required=required_options)
 
   return options
 
 
 def main():
   options = ParseArgs()
   android_jar = os.path.join(options.android_sdk, 'android.jar')
   aapt = os.path.join(options.android_sdk_tools, 'aapt')
 
@@ skipping 30 matching lines @@
               '-S', options.crunch_input_dir,
               '-C', options.crunch_output_dir]
   build_utils.CheckCallDie(aapt_cmd, suppress_output=True)
 
   if options.stamp:
     build_utils.Touch(options.stamp)
 
 
 if __name__ == '__main__':
   main()