build/android/gyp/process_resources.py - Issue 21977003: Build changes for updating Android SDK to 4.3.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Turns out we need ANDROID_SDK_VERSION in constants.py (findbugs uses it). 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:

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..393a6667e95dbe48286c2c77e5c255e86882d015 100755

--- a/build/android/gyp/process_resources.py

+++ b/build/android/gyp/process_resources.py

@@ -21,7 +21,7 @@ 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')

+ 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_tools', 'R_dir',

+ 'res_dirs', 'crunch_input_dir', 'crunch_output_dir')

build_utils.CheckOptions(options, parser, required=required_options)

return options

« no previous file with comments | « build/android/gyp/dex.py ('k') | build/android/pylib/constants.py » ('j') | no next file with comments »