mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-05 23:10:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplify SDK path configuration

Browse source 
As long as we're making the user specify the path to the SDK, we can
use that information to find all the tools - there's no need for
specifying the location of aapt separately or requiring the tools to
be in $PATH.
This commit is contained in:
Henrik Tunedal 2011-04-06 20:55:27 +02:00
parent a87532a54c
commit 4cfc02ae9d
4 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
build.py
View file

@ -195,7 +195,8 @@ for app in apps:
# Generate (or update) the ant build file, build.xml...
if thisbuild.get('update', 'yes') == 'yes':
parms = ['android','update','project','-p','.']
parms = [os.path.join(sdk_path, 'tools', 'android'),
'update', 'project', '-p', '.']
parms.append('--subprojects')
if thisbuild.has_key('target'):
parms.append('-t')
@ -449,8 +450,10 @@ for app in apps:
# By way of a sanity check, make sure the version and version
# code in our new apk match what we expect...
p = subprocess.Popen([aapt_path,'dump','badging',
src], stdout=subprocess.PIPE)
p = subprocess.Popen([os.path.join(sdk_path, 'platform-tools',
'aapt'),
'dump', 'badging', src],
stdout=subprocess.PIPE)
output = p.communicate()[0]
if thisbuild.get('novcheck', 'no') == "yes":
vercode = thisbuild['vercode']
@ -531,8 +534,9 @@ for app in apps:
sys.exit(1)
# Zipalign it...
p = subprocess.Popen(['zipalign', '-v', '4',
dest_unsigned, dest], stdout=subprocess.PIPE)
p = subprocess.Popen([os.path.join(sdk_path,'tools','zipalign'),
'-v', '4', dest_unsigned, dest],
stdout=subprocess.PIPE)
output = p.communicate()[0]
print output
if p.returncode != 0: