Build changes for updating Android SDK to 4.3.

build/android/gyp/process_resources.py

Index: build/android/gyp/process_resources.py
diff --git a/build/android/gyp/process_resources.py b/build/android/gyp/process_resources.py
index 40f1017ce5cf92df9a7d8164812d17b5556e4230..b7cafa09d13fdbdf024aca2dfc86ccd2d49ce894 100755
--- a/build/android/gyp/process_resources.py
+++ b/build/android/gyp/process_resources.py
@@ -20,7 +20,7 @@ def ParseArgs():
   """
   parser = optparse.OptionParser()
   parser.add_option('--android-sdk', help='path to the Android SDK folder')
-  parser.add_option('--android-sdk-tools',
+  parser.add_option('--android-sdk-build-tools',
                     help='path to the Android SDK platform tools folder')

[Andrew Hayden (chromium.org), 2013/08/05 09:49:14]

this is now the build tools folder, right? s/platform/build/

[navabi, 2013/08/06 23:07:33]

Yes. Good catch. Done.

   parser.add_option('--R-dir', help='directory to hold generated R.java')
   parser.add_option('--res-dirs',
@@ -43,8 +43,8 @@ def ParseArgs():
     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_build_tools', 'R_dir',
+                      'res_dirs', 'crunch_input_dir', 'crunch_output_dir')
   build_utils.CheckOptions(options, parser, required=required_options)
 
   return options
@@ -53,7 +53,7 @@ def ParseArgs():
 def main():
   options = ParseArgs()
   android_jar = os.path.join(options.android_sdk, 'android.jar')
-  aapt = os.path.join(options.android_sdk_tools, 'aapt')
+  aapt = os.path.join(options.android_sdk_build_tools, 'aapt')
 
   build_utils.MakeDirectory(options.R_dir)