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

Don't remove output dirs twice. --subprojects is useless.

Browse Source
This commit is contained in:
Daniel Martí 2013-10-31 17:56:12 +01:00
parent e080bb3983
commit 16baeece58
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fdroidserver/common.py
View File

@ -1355,7 +1355,6 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, sdk_path,
'maven' not in build and 'gradle' not in build): 'maven' not in build and 'gradle' not in build):
parms = [os.path.join(sdk_path, 'tools', 'android'), parms = [os.path.join(sdk_path, 'tools', 'android'),
'update', 'project', '-p', '.'] 'update', 'project', '-p', '.']
parms.append('--subprojects')
if 'target' in build: if 'target' in build:
parms.append('-t') parms.append('-t')
parms.append(build['target']) parms.append(build['target'])
@ -1369,19 +1368,6 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, sdk_path,
print 'Force-removing old build.xml' print 'Force-removing old build.xml'
os.remove(buildxml) os.remove(buildxml)
baddirs = [
'gen', 'bin', 'obj', # ant
'libs/armeabi-v7a', 'libs/armeabi', # jni
'libs/mips', 'libs/x86'] # jni
if 'gradle' in build:
baddirs.append('build')
if 'maven' in build:
baddirs.append('target')
for baddir in baddirs:
badpath = os.path.join(build_dir, baddir)
if os.path.exists(badpath):
print "Removing '%s'" % badpath
shutil.rmtree(badpath)
for d in update_dirs: for d in update_dirs:
cwd = os.path.join(root_dir, d) cwd = os.path.join(root_dir, d)
# Remove gen and bin dirs in libraries # Remove gen and bin dirs in libraries