kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-10 17:30:11 +01:00
Code Activity

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

Browse Source 
Conflicts:
	fdroidserver/common.py
This commit is contained in:
Ciaran Gultnieks 2013-03-18 17:33:20 +00:00
commit 02492c3563
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
fdroidserver/common.py
View File

@ -1331,7 +1331,7 @@ def getsrclib(spec, extlib_dir, sdk_path, basepath=False):
vcs = getvcs('git', vcs = getvcs('git',
'https://github.com/dschuermann/root-commands.git', sdir, sdk_path) 'https://github.com/dschuermann/root-commands.git', sdir, sdk_path)
vcs.gotorevision(ref) vcs.gotorevision(ref)
libdir = os.path.join(sdir, 'RootCommands Library') libdir = os.path.join(sdir, 'RootCommands-Library')
if subprocess.call([os.path.join(sdk_path, 'tools', 'android'), if subprocess.call([os.path.join(sdk_path, 'tools', 'android'),
'update', 'project', '-p', 'update', 'project', '-p',
libdir]) != 0: libdir]) != 0:
@ -1605,6 +1605,27 @@ def getsrclib(spec, extlib_dir, sdk_path, basepath=False):
raise BuildException('Error updating LocaleAPI project') raise BuildException('Error updating LocaleAPI project')
return sdir 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) raise BuildException('Unknown srclib ' + name)