Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2900)

Unified Diff: build/android/gyp/process_resources.py

Issue 21977003: Build changes for updating Android SDK to 4.3. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Roll android_tools in src/DEPS to new SDK. Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..f7f931e2289d11d0b237ad11967ce78ddc388e29 100755
--- a/build/android/gyp/process_resources.py
+++ b/build/android/gyp/process_resources.py
@@ -20,8 +20,8 @@ def ParseArgs():
"""
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')
+ parser.add_option('--android-sdk-build-tools',
+ 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')
@@ -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)

Powered by Google App Engine
This is Rietveld 408576698