build/android/gyp/dex.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/dex.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/dex.py

diff --git a/build/android/gyp/dex.py b/build/android/gyp/dex.py

index 86f3878f7f0d4b456906d32745916b807918f415..21e1183e872bacfd10094d05aea99449205a6927 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_tools, 'dx')

dex_cmd = [dx_binary, '--dex', '--output', options.dex_path] + paths

record_path = '%s.md5.stamp' % options.dex_path

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

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