mirror/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2026-01-26 00:08:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

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 = None if not nativecode else nativecode
if thisbuild['buildjni'] != 'no':
if thisbuild['buildjni'] and thisbuild['buildjni'] != ['no']:
if nativecode is not None:
raise BuildException("Native code should have been built but none was packaged")
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)
if (os.path.exists(os.path.join(root_dir, 'jni')) and
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
return count