build/android/gyp/apk_install.py - Issue 380343003: Update GetNewMetadata function to be more forgiving for directory names.

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_install.py

Issue 380343003: Update GetNewMetadata function to be more forgiving for directory names. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 5 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/gyp/apk_install.py

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

index c0c9b6b88cf587410ff2c1ea68a3be643d44d051..19a217ccf5234a22814168ed7341f5fb9a76fe8a 100755

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

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

@@ -31,7 +31,7 @@ def GetNewMetadata(device, apk_package):

# org.chromium.chrome.shell.apk

# -rw-r--r-- system system 7376582 2013-04-19 16:34 \

# org.chromium.chrome.shell-1.apk

- apk_matcher = lambda s: re.match('.*%s(-[0-9]*)?.apk$' % apk_package, s)

+ apk_matcher = lambda s: re.match('.*%s(-[0-9]*)?(.apk)?$' % apk_package, s)

matches = filter(apk_matcher, output)

return matches[0] if matches else None

« no previous file with comments | « no previous file | no next file » | no next file with comments »