mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-16 07:52:35 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Install Java 1.8 alongside 1.7 for retrolambda

Browse source 
Fixes #103.
This commit is contained in:
Daniel Martí 2015-09-03 21:44:59 -07:00
parent 6812390e39
commit a4d1fa22f7
4 changed files with 26 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
fdroidserver/common.py
View file

@ -57,6 +57,10 @@ default_config = {
'r10e': "$ANDROID_NDK",
},
'build_tools': "23.0.1",
'java_paths': {
'1.7': "/usr/lib/jvm/java-7-openjdk",
'1.8': None,
},
'ant': "ant",
'mvn3': "mvn",
'gradle': 'gradle',
@ -122,7 +126,7 @@ def fill_config_defaults(thisconfig):
thisconfig[k] = exp
thisconfig[k + '_orig'] = v
for k in ['ndk_paths']:
for k in ['ndk_paths', 'java_paths']:
d = thisconfig[k]
for k2 in d.copy():
v = d[k2]
@ -185,6 +189,11 @@ def read_config(opts, config_file='config.py'):
for n in ['ANDROID_HOME', 'ANDROID_SDK']:
env[n] = config['sdk_path']
for v in ['7', '8']:
cpath = config['java_paths']['1.%s' % v]
if cpath:
env['JAVA%s_HOME' % v] = cpath
for k in ["keystorepass", "keypass"]:
if k in config:
write_password_file(k)