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

Small buildjni= fixes

Browse source
This commit is contained in:
Daniel Martí 2014-06-24 22:31:39 +02:00
parent 53aba5365f
commit 2c8df2c1ef
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
fdroidserver/build.py
View file

@ -815,7 +815,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
nativecode = nativecode.strip() nativecode = nativecode.strip()
nativecode = None if not nativecode else nativecode nativecode = None if not nativecode else nativecode
if thisbuild['buildjni'] != 'no': if thisbuild['buildjni'] and thisbuild['buildjni'] != ['no']:
if nativecode is not None: if nativecode is not None:
raise BuildException("Native code should have been built but none was packaged") raise BuildException("Native code should have been built but none was packaged")
if thisbuild['novcheck']: if thisbuild['novcheck']:

2
fdroidserver/common.py
View file

@ -1456,7 +1456,7 @@ def scan_source(build_dir, root_dir, thisbuild):
# buildjni=no to bypass this check) # buildjni=no to bypass this check)
if (os.path.exists(os.path.join(root_dir, 'jni')) and if (os.path.exists(os.path.join(root_dir, 'jni')) and
not thisbuild['buildjni']): not thisbuild['buildjni']):
logging.error('Found jni directory, but buildjni is not enabled') logging.error('Found jni directory, but buildjni is not enabled. Set it to \'no\' to ignore.')
count += 1 count += 1
return count return count