From cd7f12e44e9c2ec9fb2950423d5271f995cb6fce Mon Sep 17 00:00:00 2001 From: David Black Date: Wed, 8 May 2013 14:04:33 +0100 Subject: [PATCH] add libs/armeabi-v7a to list of dirs deleted before building... I had completely forgotten that native libs were being deleted before building . It is a sensible thing to do but I'm sure others will fall foul of this one day. --- fdroidserver/common.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 531b53ef..fc097194 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -2034,9 +2034,9 @@ def prepare_source(vcs, app, build, build_dir, extlib_dir, sdk_path, ndk_path, j if basesrclib: srclibpaths.append(basesrclib) - # There should never be gen or bin directories in the source, so just get + # There should never be bin, gen or native libs directories in the source, so just get # rid of them... - for baddir in ['gen', 'bin', 'obj', 'libs/armeabi', 'libs/mips', 'libs/x86']: + for baddir in ['gen', 'bin', 'obj', 'libs/armeabi-v7a', 'libs/armeabi', 'libs/mips', 'libs/x86']: badpath = os.path.join(root_dir, baddir) if os.path.exists(badpath): shutil.rmtree(badpath)