build/android/finalize_apk_action.gypi - Issue 238253015: Finalize apk takes zipalign path as argument instead of hardcoding it

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/finalize_apk_action.gypi

Issue 238253015: Finalize apk takes zipalign path as argument instead of hardcoding it (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Put a condition to set the zipalign path to be empty for webview Created 6 years, 8 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/finalize_apk_action.gypi

diff --git a/build/android/finalize_apk_action.gypi b/build/android/finalize_apk_action.gypi

index afe9f1b702f7347585016f0366eae80a792ec482..bfb7ccdb7b008af083069fb42b5fb560e7eeba83 100644

--- a/build/android/finalize_apk_action.gypi

+++ b/build/android/finalize_apk_action.gypi

@@ -22,6 +22,14 @@

'keystore_path%': '<(DEPTH)/build/android/ant/chromium-debug.keystore',

'keystore_name%': 'chromiumdebugkey',

'keystore_password%': 'chromium',

+ 'conditions': [

+ # Webview doesn't use zipalign.

+ ['android_webview_build==0', {

+ 'zipalign_path%': ['<!@(find <(android_sdk_root) -name zipalign)'],

+ }, {

+ 'zipalign_path%': "",

+ }],

+ ],

'inputs': [

'<(DEPTH)/build/android/gyp/util/build_utils.py',

@@ -34,7 +42,7 @@

'action': [

'python', '<(DEPTH)/build/android/gyp/finalize_apk.py',

- '--android-sdk-root=<(android_sdk_root)',

+ '--zipalign-path=<(zipalign_path)',

'--unsigned-apk-path=<(input_apk_path)',

'--final-apk-path=<(output_apk_path)',

'--key-path=<(keystore_path)',

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