From b5047139e9f76d3d9c4caa2db21b855eff261106 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Tue, 19 Mar 2013 15:16:46 +0100 Subject: [PATCH 1/3] Don't check for .elf. .so is just a warning now. --- fdroidserver/common.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index a948f821..998649d6 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -2008,8 +2008,8 @@ def scan_source(build_dir, root_dir, thisbuild): msg = 'Found apk file, which should not be in the source - ' + fp problems.append(msg) - elif curfile.endswith('.so') or curfile.endswith('.elf'): - msg = 'Found ELF at ' + fp + elif curfile.endswith('.so'): + print 'Warning: ELF at ' + fp problems.append(msg) elif curfile.endswith('.java'): From e64a3ad51519dbb93e392a8305411cd56d83d084 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Tue, 19 Mar 2013 15:32:51 +0100 Subject: [PATCH 2/3] As per @daithib8's request, remove some extra dirs --- fdroidserver/common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 998649d6..e4e2be4e 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -1828,7 +1828,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 # 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) if os.path.exists(badpath): shutil.rmtree(badpath) From df4345e275b358c51ade63d18cd0c622e9e377a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Tue, 19 Mar 2013 15:38:54 +0100 Subject: [PATCH 3/3] Fix elf check --- fdroidserver/common.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index e4e2be4e..308bb030 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -2009,8 +2009,11 @@ def scan_source(build_dir, root_dir, thisbuild): problems.append(msg) elif curfile.endswith('.so'): - print 'Warning: ELF at ' + fp - problems.append(msg) + if '/jni' in r: + print 'Warning: Found ELF at ' + fp + else: + msg = 'Found ELF at ' + fp + problems.append(msg) elif curfile.endswith('.java'): for line in file(fp):