From f9eda502764a9e080306955c4908f63e6acba420 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Thu, 10 Oct 2013 16:30:32 +0200 Subject: [PATCH] Fix silly object name issue, also clean jni dirs --- fdroidserver/build.py | 10 ++++++++++ fdroidserver/common.py | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/fdroidserver/build.py b/fdroidserver/build.py index d9cb8309..39e233e4 100644 --- a/fdroidserver/build.py +++ b/fdroidserver/build.py @@ -390,6 +390,16 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d else: error += line + # Also clean jni + print "Cleaning jni dirs..." + for baddir in [ + 'libs/armeabi-v7a', 'libs/armeabi', + 'libs/mips', 'libs/x86']: + 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 3bb6c491..62bf816f 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -1208,7 +1208,7 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, sdk_path, p.communicate() if p.returncode != 0: raise BuildException("Error running init command for %s:%s" % - (app['id'], thisbuild['version']), output, error) + (app['id'], build['version']), output, error) # Generate (or update) the ant build file, build.xml... updatemode = build.get('update', '.') @@ -1430,7 +1430,7 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, sdk_path, p.communicate() if p.returncode != 0: raise BuildException("Error running prebuild command for %s:%s" % - (app['id'], thisbuild['version']), output, error) + (app['id'], build['version']), output, error) print "Applying generic clean-ups..." if build.get('anal-tics', 'no') == 'yes':