LBRYCommunity/buildozer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/kivy/buildozer

Browse source 
Conflicts:
	buildozer/targets/android.py
This commit is contained in:
Thomas Aglassinger 2013-07-06 17:39:34 +02:00
commit bc396e2aa5
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
buildozer/targets/android.py
View file

@ -89,23 +89,21 @@ class TargetAndroid(Target):
except:
traceback.print_exc()
self.android_cmd = join(self.android_sdk_dir, 'tools', 'android.bat')
self.ant_cmd = join(self.apache_ant_dir, 'bin', 'ant.bat')
self.adb_cmd = join(self.android_sdk_dir, 'platform-tools', 'adb.exe')
self.javac_cmd = self._locate_java('javac.exe')
self.keytool_cmd = self._locate_java('keytool.exe')
elif platform in ('darwin', ):
self.android_cmd = join(self.android_sdk_dir, 'tools', 'android')
self.ant_cmd = join(self.apache_ant_dir, 'bin', 'ant')
self.adb_cmd = join(self.android_sdk_dir, 'platform-tools', 'adb')
self.javac_cmd = self._locate_java('javac')
self.keytool_cmd = self._locate_java('keytool')
else:
self.android_cmd = join(self.android_sdk_dir, 'tools', 'android')
self.ant_cmd = join(self.apache_ant_dir, 'bin', 'ant')
self.adb_cmd = join(self.android_sdk_dir, 'platform-tools', 'adb')
self.javac_cmd = self._locate_java('javac')
self.keytool_cmd = self._locate_java('keytool')
# Check for C header <zlib.h>.
_, _, returncode_dpkg = self.buildozer.cmd(
'dpkg --version', break_on_error= False)
is_debian_like = (returncode_dpkg == 0)
@ -114,6 +112,14 @@ class TargetAndroid(Target):
message = 'zlib headers must be installed, run: sudo apt-get install zlib1g-dev'
raise BuildozerException(message)
# Need to add internally installed ant to path for external tools
# like adb to use
path = [join(self.apache_ant_dir, 'bin')]
if 'PATH' in self.buildozer.environ:
path.append(self.buildozer.environ['PATH'])
else:
path.append(os.environ['PATH'])
self.buildozer.environ['PATH'] = ':'.join(path)
checkbin = self.buildozer.checkbin
checkbin('Git git', 'git')
checkbin('Cython cython', 'cython')
@ -475,10 +481,14 @@ class TargetAndroid(Target):
serial = environ.get('ANDROID_SERIAL')
if serial:
return serial.split(',')
l = self.buildozer.cmd('adb devices',
get_stdout=True)[0].splitlines()[1:-1]
l = self.buildozer.cmd('{} devices'.format(self.adb_cmd),
get_stdout=True)[0].splitlines()
serials = []
for serial in l:
if not serial:
continue
if serial.startswith('*') or serial.startswith('List '):
continue
serials.append(serial.split()[0])
self._serials = serials
return serials