build/android/finalize_apk_action.gypi - Issue 661073003: Roll Android SDK to v21

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 661073003: Roll Android SDK to v21 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/master

Patch Set: Update DEPS again Created 6 years, 2 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 6187239fd9ce657dd004148b4faa265d14fc5003..5ffbffaefc31879eacef09d831030bd2b6fed910 100644

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

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

@@ -25,7 +25,7 @@

'conditions': [

# Webview doesn't use zipalign or rezip_apk_jar.

['android_webview_build==0', {

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

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

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

}, {

'zipalign_path%': "",

« no previous file with comments | « DEPS ('k') | build/android/pylib/constants.py » ('j') | no next file with comments »