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

Merge pull request #465 from ZingBallyhoo/skip_update_fix

Browse source 
android_new: change skip_update to skip all updates
This commit is contained in:
Mathieu Virbel 2017-04-17 12:04:30 +02:00 committed by GitHub
commit 2ec50fd84f
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
buildozer/targets/android.py
View file

@ -415,19 +415,17 @@ class TargetAndroid(Target):
'build-tools') 'build-tools')
packages = self._android_list_sdk(include_all=True) packages = self._android_list_sdk(include_all=True)
ver = self._find_latest_package(packages, 'build-tools-') ver = self._find_latest_package(packages, 'build-tools-')
if ver and ver > v_build_tools: if ver and ver > v_build_tools and not skip_upd:
self._android_update_sdk(self._build_package_string('build-tools', self._android_update_sdk(self._build_package_string('build-tools', ver))
ver))
# 2.bis check aidl can be runned # 2.bis check aidl can be runned
self._check_aidl(v_build_tools) self._check_aidl(v_build_tools)
# 3. finally, install the android for the current api # 3. finally, install the android for the current api
android_platform = join(self.android_sdk_dir, 'platforms', android_platform = join(self.android_sdk_dir, 'platforms', 'android-{0}'.format(self.android_api))
'android-{0}'.format(self.android_api))
if not self.buildozer.file_exists(android_platform): if not self.buildozer.file_exists(android_platform):
packages = self._android_list_sdk() packages = self._android_list_sdk()
android_package = 'android-{}'.format(self.android_api) android_package = 'android-{}'.format(self.android_api)
if android_package in packages: if android_package in packages and not skip_upd:
self._android_update_sdk(android_package) self._android_update_sdk(android_package)
self.buildozer.info('Android packages installation done.') self.buildozer.info('Android packages installation done.')