mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-06 07:20:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Ciaran Gultnieks 2013-03-20 09:36:00 +00:00
commit 8c195c637a
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
fdroidserver/common.py
View file

@ -1830,7 +1830,7 @@ def prepare_source(vcs, app, build, build_dir, extlib_dir, sdk_path, ndk_path, j
# There should never be gen or bin directories in the source, so just get # There should never be gen or bin directories in the source, so just get
# rid of them... # rid of them...
for baddir in ['gen', 'bin']: for baddir in ['gen', 'bin', 'obj', 'libs/armeabi', 'libs/mips', 'libs/x86']:
badpath = os.path.join(root_dir, baddir) badpath = os.path.join(root_dir, baddir)
if os.path.exists(badpath): if os.path.exists(badpath):
shutil.rmtree(badpath) shutil.rmtree(badpath)
@ -2010,7 +2010,10 @@ def scan_source(build_dir, root_dir, thisbuild):
msg = 'Found apk file, which should not be in the source - ' + fp msg = 'Found apk file, which should not be in the source - ' + fp
problems.append(msg) problems.append(msg)
elif curfile.endswith('.so') or curfile.endswith('.elf'): elif curfile.endswith('.so'):
if '/jni' in r:
print 'Warning: Found ELF at ' + fp
else:
msg = 'Found ELF at ' + fp msg = 'Found ELF at ' + fp
problems.append(msg) problems.append(msg)