From 0cba3c68dc9916da65484e07ee360ff2d3972780 Mon Sep 17 00:00:00 2001 From: Marc Bonnici Date: Fri, 4 Jan 2019 17:23:08 +0000 Subject: fw/resource: Support matching APKs on multiple versions. In the case where a range of apk versions are valid allow for the matching process to accommodate a list of versions instead of a single value. --- wa/framework/resource.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/wa/framework/resource.py b/wa/framework/resource.py index aa1e04c2..a4dd7076 100644 --- a/wa/framework/resource.py +++ b/wa/framework/resource.py @@ -273,10 +273,14 @@ class ResourceResolver(object): def apk_version_matches(path, version): + version = list_or_string(version) info = ApkInfo(path) - if info.version_name == version or info.version_code == version: - return True - return loose_version_matching(version, info.version_name) + for v in version: + if info.version_name == v or info.version_code == v: + return True + if loose_version_matching(v, info.version_name): + return True + return False def loose_version_matching(config_version, apk_version): -- cgit v1.2.3