kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-09 17:00:12 +01:00
Code Activity

Don't forcefully remove libs/<arch>, we now see binaries

Browse Source
This commit is contained in:
Daniel Martí 2014-01-06 12:08:57 +01:00
parent cf852012ed
commit c06b817449
2 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fdroidserver/build.py
View File

@ -420,16 +420,6 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
raise BuildException("Error cleaning %s:%s" % raise BuildException("Error cleaning %s:%s" %
(app['id'], thisbuild['version']), p.stdout, p.stderr) (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... # Scan before building...
print "Scanning source for common problems..." print "Scanning source for common problems..."
buildprobs = common.scan_source(build_dir, root_dir, thisbuild) buildprobs = common.scan_source(build_dir, root_dir, thisbuild)

5
fdroidserver/common.py
View File

@ -943,10 +943,7 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
for d in update_dirs: for d in update_dirs:
# Remove gen and bin dirs in libraries # Remove gen and bin dirs in libraries
# rid of them... # rid of them...
for baddir in [ for baddir in ['gen', 'bin', 'obj']
'gen', 'bin', 'obj', # ant
'libs/armeabi-v7a', 'libs/armeabi', # jni
'libs/mips', 'libs/x86']:
badpath = os.path.join(root_dir, d, baddir) badpath = os.path.join(root_dir, d, baddir)
if os.path.exists(badpath): if os.path.exists(badpath):
print "Removing '%s'" % badpath print "Removing '%s'" % badpath