build/android/gyp/process_resources.py - Issue 1162943008: Make aapt and aidl paths flexible.

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 1162943008: Make aapt and aidl paths flexible. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix GN builds Created 5 years, 6 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 8a2637da33af144b2ca515394480fbbaf74b5bf2..d227954ae96af22f748c6ab35b16780a5e1fa522 100755

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

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

@@ -38,8 +38,8 @@ def ParseArgs(args):

build_utils.AddDepfileOption(parser)

parser.add_option('--android-sdk', help='path to the Android SDK folder')

- parser.add_option('--android-sdk-tools',

- help='path to the Android SDK build tools folder')

+ parser.add_option('--aapt-path',

+ help='path to the Android aapt tool')

parser.add_option('--non-constant-id', action='store_true')

parser.add_option('--android-manifest', help='AndroidManifest.xml path')

@@ -102,7 +102,7 @@ def ParseArgs(args):

# Check that required options have been provided.

required_options = (

'android_sdk',

- 'android_sdk_tools',

+ 'aapt_path',

'android_manifest',

'dependencies_res_zips',

'resource_dirs',

@@ -303,7 +303,7 @@ def main():

options = ParseArgs(args)

android_jar = os.path.join(options.android_sdk, 'android.jar')

- aapt = os.path.join(options.android_sdk_tools, 'aapt')

+ aapt = options.aapt_path

input_files = []

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