From 167d9df3a02dfb9bf2cb5737947defd92fe51a57 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Tue, 18 Mar 2014 15:44:39 +0100 Subject: [PATCH] Support auto names on gradle projects --- fdroidserver/common.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index a32e2ae5..301340e5 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -591,13 +591,17 @@ class vcs_bzr(vcs): def retrieve_string(app_dir, string, xmlfiles=None): - res_dir = os.path.join(app_dir, 'res') + res_dirs = [ + os.path.join(app_dir, 'res'), + os.path.join(app_dir, 'src/main/res'), + ] if xmlfiles is None: xmlfiles = [] - for r,d,f in os.walk(res_dir): - if r.endswith('/values'): - xmlfiles += [os.path.join(r,x) for x in f if x.endswith('.xml')] + for res_dir in res_dirs: + for r,d,f in os.walk(res_dir): + if r.endswith('/values'): + xmlfiles += [os.path.join(r,x) for x in f if x.endswith('.xml')] string_search = None if string.startswith('@string/'): -- 2.30.2