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..a986f97ef4e7094d3ceaee1bb9d2b54dddc7188a 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,9 @@ def DoDex(options, paths):
 def main(argv):
   parser = optparse.OptionParser()
   parser.add_option('--android-sdk-root', help='Android sdk root directory.')

[cjhopman, 2013/08/07 18:14:25]

This isn't used anymore.

[navabi, 2013/08/07 18:24:13]

Removed. Along with all instances of calls to dex.py:
build/android/dex_action.gypi
build/java_prebuilt.gypi
build/uiautomator_test.gypi

+  # The build-tools (e.g. aidl) are in sdk/build-tools/<build_tools_version>/.
+  parser.add_option('--android-sdk-build-tools',
+                    help='Android sdk build tools directory.')
   parser.add_option('--dex-path', help='Dex output path.')
   parser.add_option('--configuration-name',
       help='The build CONFIGURATION_NAME.')