From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Mon, 18 Mar 2013 17:33:20 +0000 (+0000)
Subject: Merge commit 'refs/merge-requests/115' of git://gitorious.org/f-droid/fdroidserver... 
X-Git-Tag: 0.1~673
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=02492c35633e9e2e7e5a07256d9e4d3840ca0ce9;p=fdroidserver.git

Merge commit 'refs/merge-requests/115' of git://gitorious.org/f-droid/fdroidserver into merge-requests/115

Conflicts:
	fdroidserver/common.py
---

02492c35633e9e2e7e5a07256d9e4d3840ca0ce9
diff --cc fdroidserver/common.py
index f7d1bdda,9c045293..f4c79919
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@@ -1594,17 -1586,27 +1594,38 @@@ def getsrclib(spec, extlib_dir, sdk_pat
          vcs.gotorevision(ref)
          return sdir
  
 +    if name == 'LocaleAPI':
 +        sdir = os.path.join(extlib_dir, 'LocaleAPI')
 +        vcs = getvcs('git',
 +                'https://git.gitorious.org/locale-api/mirror.git', sdir, sdk_path)
 +        vcs.gotorevision(ref)
 +        if subprocess.call([os.path.join(sdk_path, 'tools', 'android'),
 +            'update', 'project', '-p',
 +            sdir]) != 0:
 +            raise BuildException('Error updating LocaleAPI project')
 +        return sdir
 +
+     if name == 'iptables':
+         sdir = os.path.join(extlib_dir, 'iptables')
+         vcs = getvcs('git',
+ 	    'https://android.googlesource.com/platform/external/iptables', sdir, sdk_path)
+         vcs.gotorevision(ref)
+         return sdir
+ 
+     if name == 'LockPattern':
+         sdir = os.path.join(extlib_dir, 'LockPattern')
+         vcs = getvcs('hg',
+ 	    'https://code.google.com/p/android-lockpattern', sdir, sdk_path)
+         vcs.gotorevision(ref)
+         libdir = os.path.join(sdir, 'code')
+         if subprocess.call([os.path.join(sdk_path, 'tools', 'android'),
+             'update', 'project', '-p',
+             libdir]) != 0:
+             raise BuildException('Error updating LockPattern project')
+         if basepath:
+             return sdir
+         return libdir
+ 
      raise BuildException('Unknown srclib ' + name)