build/android/gyp/apk_obfuscate.py - Issue 1647353002: Use gn_helpers to [se]serialize GN lists.

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/apk_obfuscate.py

Issue 1647353002: Use gn_helpers to [se]serialize GN lists. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@python_impl

Patch Set: more Created 4 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/apk_obfuscate.py

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

index 99b6176f90ebfbca83a2be518a09b36cb66e3032..04a04b3dd86cae9cb4746b83da3bb09ff22edd1b 100755

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

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

@@ -101,10 +101,10 @@ def DoProguard(options):

proguard = proguard_util.ProguardCmdBuilder(options.proguard_jar_path)

proguard.outjar(options.obfuscated_jar_path)

- input_jars = build_utils.ParseGypList(options.input_jars_paths)

+ input_jars = build_utils.ParseGnList(options.input_jars_paths)

exclude_paths = []

- configs = build_utils.ParseGypList(options.proguard_configs)

+ configs = build_utils.ParseGnList(options.proguard_configs)

if options.tested_apk_obfuscated_jar_path:

# configs should only contain the process_resources.py generated config.

assert len(configs) == 1, (

@@ -153,7 +153,7 @@ def _PossibleMultidexConfig(options):

def main(argv):

options, _ = ParseArgs(argv)

- input_jars = build_utils.ParseGypList(options.input_jars_paths)

+ input_jars = build_utils.ParseGnList(options.input_jars_paths)

if options.testapp:

dependency_class_filters = [

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