Build changes for updating Android SDK to 4.3.

build/android/gyp/dex.py

Index: build/android/gyp/dex.py
diff --git a/build/android/gyp/dex.py b/build/android/gyp/dex.py
index 86f3878f7f0d4b456906d32745916b807918f415..3ef3261d5dfa9ca373b2b137fd66cad1740d5713 100755
--- a/build/android/gyp/dex.py
+++ b/build/android/gyp/dex.py
@@ -14,7 +14,7 @@ from util import md5_check
 
 
 def DoDex(options, paths):
-  dx_binary = os.path.join(options.android_sdk_root, 'platform-tools', 'dx')
+  dx_binary = os.path.join(options.android_sdk_build_tools, 'dx')
   dex_cmd = [dx_binary, '--dex', '--output', options.dex_path] + paths
 
   record_path = '%s.md5.stamp' % options.dex_path
@@ -30,6 +30,8 @@ def DoDex(options, paths):
 def main(argv):
   parser = optparse.OptionParser()
   parser.add_option('--android-sdk-root', help='Android sdk root directory.')
+  parser.add_option('--android-sdk-build-tools',
+                    help='Android sdk build tools.')

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

Perhaps (to match what is above):
Android sdk build tools directory.

We should probably also add a note explaining why the sdk build tools directory
cannot be derived from the sdk-root.

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

Done.

   parser.add_option('--dex-path', help='Dex output path.')
   parser.add_option('--configuration-name',
       help='The build CONFIGURATION_NAME.')