build/android/gyp/create_standalone_apk.py - Issue 106923002: Don't use sys.exit() in build_utils.CheckCallDie().

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

Issue 106923002: Don't use sys.exit() in build_utils.CheckCallDie(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years 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/create_standalone_apk.py

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

index de541a6d5efae9188e4d00df0a3b85e194eecb18..19520916803e43dc12c5b8daa45a49f95bce5e27 100755

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

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

@@ -23,10 +23,9 @@ def CreateStandaloneApk(options):

intermediate_path = intermediate_file.name

shutil.copy(options.input_apk_path, intermediate_path)

apk_path_abs = os.path.abspath(intermediate_path)

- build_utils.CheckCallDie(

+ build_utils.CheckOutput(

['zip', '-r', '-1', apk_path_abs, 'lib'],

- cwd=options.libraries_top_dir,

- suppress_output=True)

+ cwd=options.libraries_top_dir)

shutil.copy(intermediate_path, options.output_apk_path)

input_paths = [options.input_apk_path, options.libraries_top_dir]