From c06b8174493a45bd8123b9737cac0e9358d63616 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Mon, 6 Jan 2014 12:08:57 +0100 Subject: [PATCH] Don't forcefully remove libs/, we now see binaries --- fdroidserver/build.py | 10 ---------- fdroidserver/common.py | 5 +---- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/fdroidserver/build.py b/fdroidserver/build.py index 5e2b4846..6bbb87d4 100644 --- a/fdroidserver/build.py +++ b/fdroidserver/build.py @@ -420,16 +420,6 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d raise BuildException("Error cleaning %s:%s" % (app['id'], thisbuild['version']), p.stdout, p.stderr) - # Also clean jni - print "Cleaning jni dirs..." - for baddir in [ - 'libs/armeabi-v7a', 'libs/armeabi', - 'libs/mips', 'libs/x86', 'obj']: - badpath = os.path.join(build_dir, baddir) - if os.path.exists(badpath): - print "Removing '%s'" % badpath - shutil.rmtree(badpath) - # Scan before building... print "Scanning source for common problems..." buildprobs = common.scan_source(build_dir, root_dir, thisbuild) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index aefa78de..47a006b4 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -943,10 +943,7 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver= for d in update_dirs: # Remove gen and bin dirs in libraries # rid of them... - for baddir in [ - 'gen', 'bin', 'obj', # ant - 'libs/armeabi-v7a', 'libs/armeabi', # jni - 'libs/mips', 'libs/x86']: + for baddir in ['gen', 'bin', 'obj'] badpath = os.path.join(root_dir, d, baddir) if os.path.exists(badpath): print "Removing '%s'" % badpath