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

whitelist: always generate the whitelist even after the initial distribution build. Otherwise, any further changes are not reflected in the final app.

Browse source
This commit is contained in:
Mathieu Virbel 2015-01-27 16:36:41 +01:00
parent 4b12f34d06
commit b17a0ef6c1
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
buildozer/targets/android.py
View file

@ -448,13 +448,6 @@ class TargetAndroid(Target):
if not exists(dist_dir): if not exists(dist_dir):
need_compile = 1 need_compile = 1
# whitelist p4a
p4a_whitelist = self.buildozer.config.getlist('app', 'android.p4a_whitelist')
if p4a_whitelist:
with open(join(self.pa_dir, 'src', 'whitelist.txt'), 'w') as fd:
for wl in p4a_whitelist:
fd.write(wl + '\n')
if not need_compile: if not need_compile:
self.buildozer.info('Distribution already compiled, pass.') self.buildozer.info('Distribution already compiled, pass.')
return return
@ -484,6 +477,13 @@ class TargetAndroid(Target):
package = package_domain + '.' + package package = package_domain + '.' + package
return package.lower() return package.lower()
def _generate_whitelist(self, dist_dir):
p4a_whitelist = self.buildozer.config.getlist('app', 'android.p4a_whitelist')
whitelist_fn = join(dist_dir, 'whitelist.txt')
with open(whitelist_fn, 'w') as fd:
for wl in p4a_whitelist:
fd.write(wl + '\n')
def build_package(self): def build_package(self):
dist_name = self.buildozer.config.get('app', 'package.name') dist_name = self.buildozer.config.get('app', 'package.name')
dist_dir = join(self.pa_dir, 'dist', dist_name) dist_dir = join(self.pa_dir, 'dist', dist_name)
@ -515,6 +515,9 @@ class TargetAndroid(Target):
# add src files # add src files
self._add_java_src(dist_dir) self._add_java_src(dist_dir)
# generate the whitelist if needed
self._generate_whitelist(dist_dir)
# build the app # build the app
build_cmd = ( build_cmd = (
'{python} build.py --name {name}' '{python} build.py --name {name}'