build/android/finalize_apk_action.gypi - Issue 1043913002: Remove most android_webview_build conditions from build.

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 1043913002: Remove most android_webview_build conditions from build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address comments and rebase Created 5 years, 9 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:

View side-by-side diff with in-line comments

Download patch

Index: build/android/finalize_apk_action.gypi

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

index 9934c1a78f1823610e4ef12b8ff66101f33d919d..bdf996604bdb07f21d9a8a4de2016c5156459479 100644

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

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

@@ -22,16 +22,8 @@

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

'keystore_name%': 'chromiumdebugkey',

'keystore_password%': 'chromium',

- 'conditions': [

- # Webview doesn't use zipalign or rezip_apk_jar.

- ['android_webview_build==0', {

- 'zipalign_path%': '<(android_sdk_tools)/zipalign',

- 'rezip_apk_jar_path%': '<(PRODUCT_DIR)/lib.java/rezip_apk.jar'

- }, {

- 'zipalign_path%': "",

- 'rezip_apk_jar_path%': "",

- }],

- ],

+ 'zipalign_path%': '<(android_sdk_tools)/zipalign',

+ 'rezip_apk_jar_path%': '<(PRODUCT_DIR)/lib.java/rezip_apk.jar',

'inputs': [

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

« no previous file with comments | « build/android/android_webview_export_whitelist.lst ('k') | build/common.gypi » ('j') | no next file with comments »