mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-09-17 10:40:12 +02:00
Merge commit 'refs/merge-requests/115' of git://gitorious.org/f-droid/fdroidserver into merge-requests/115
Conflicts: fdroidserver/common.py
This commit is contained in:
commit
02492c3563
@ -1331,7 +1331,7 @@ def getsrclib(spec, extlib_dir, sdk_path, basepath=False):
|
||||
vcs = getvcs('git',
|
||||
'https://github.com/dschuermann/root-commands.git', sdir, sdk_path)
|
||||
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'),
|
||||
'update', 'project', '-p',
|
||||
libdir]) != 0:
|
||||
@ -1605,6 +1605,27 @@ def getsrclib(spec, extlib_dir, sdk_path, basepath=False):
|
||||
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)
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user