fix buildozer PACKAGES_PATH to use global buildozer directory instead of the local one.

This commit is contained in:
Mathieu Virbel 2013-10-31 03:11:53 +01:00
parent cca30b454a
commit b64fd7a41c
2 changed files with 5 additions and 5 deletions

View file

@ -670,10 +670,6 @@ class Buildozer(object):
def app_dir(self): def app_dir(self):
return join(self.buildozer_dir, self.targetname, 'app') return join(self.buildozer_dir, self.targetname, 'app')
@property
def packages_dir(self):
return join(self.buildozer_dir, self.targetname, 'packages')
@property @property
def applibs_dir(self): def applibs_dir(self):
return join(self.buildozer_dir, 'applibs') return join(self.buildozer_dir, 'applibs')
@ -686,6 +682,10 @@ class Buildozer(object):
def global_platform_dir(self): def global_platform_dir(self):
return join(self.global_buildozer_dir, self.targetname, 'platform') return join(self.global_buildozer_dir, self.targetname, 'platform')
@property
def global_packages_dir(self):
return join(self.global_buildozer_dir, self.targetname, 'packages')
@property @property
def global_cache_dir(self): def global_cache_dir(self):
return join(self.global_buildozer_dir, 'cache') return join(self.global_buildozer_dir, 'cache')

View file

@ -321,7 +321,7 @@ class TargetAndroid(Target):
self.check_configuration_tokens() self.check_configuration_tokens()
self.buildozer.environ.update({ self.buildozer.environ.update({
'PACKAGES_PATH': self.buildozer.packages_dir, 'PACKAGES_PATH': self.buildozer.global_packages_dir,
'ANDROIDSDK': self.android_sdk_dir, 'ANDROIDSDK': self.android_sdk_dir,
'ANDROIDNDK': self.android_ndk_dir, 'ANDROIDNDK': self.android_ndk_dir,
'ANDROIDAPI': self.android_api, 'ANDROIDAPI': self.android_api,