From: Daniel Martí <mvdan@mvdan.cc>
Date: Tue, 18 Mar 2014 14:44:39 +0000 (+0100)
Subject: Support auto names on gradle projects
X-Git-Tag: 0.2~179
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=167d9df3a02dfb9bf2cb5737947defd92fe51a57;p=fdroidserver.git

Support auto names on gradle projects
---

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/'):