8000 various fixes · germn/python-for-android@0f786d6 · GitHub
[go: up one dir, main page]

Skip to content 65E7

Commit 0f786d6

Browse files
committed
various fixes
1 parent 5298c7f commit 0f786d6

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

pythonforandroid/toolchain.py

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,9 @@ class ArchARMv7_a(ArchARM):
544544

545545
def get_env(self):
546546
env = super(ArchARMv7_a, self).get_env()
547-
env['CFLAGS'] = env['CFLAGS'] + ' -march=armv7-a -mfloat-abi=softfp -mfpu=vfp -mthumb'
547+
# env['CFLAGS'] += ' -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16'
548+
env['CFLAGS'] += ' -march=armv7-a -mfloat-abi=softfp -mfpu=neon -mthumb'
549+
env['LDFLAGS'] += ' -march=armv7-a'
548550
env['CXXFLAGS'] = env['CFLAGS']
549551
return env
550552

@@ -1535,19 +1537,19 @@ def distribute_libs(self, arch, src_dirs, wildcard='*'):
15351537
tgt_dir = join('libs', arch.arch)
15361538
ensure_dir(tgt_dir)
15371539
for src_dir in src_dirs:
1538-
for lib in glob.glob(join(src_dir, wildcard)):
1540+
for lib in glob(join(src_dir, wildcard)):
15391541
shprint(sh.cp, '-a', lib, tgt_dir)
15401542

15411543
def distribute_javaclasses(self, javaclass_dir):
15421544
'''Copy existing javaclasses from build dir to current dist dir.'''
15431545
info('Copying java files')
1544-
for filename in glob.glob(javaclass_dir):
1546+
for filename in glob(javaclass_dir):
15451547
shprint(sh.cp, '-a', filename, 'src')
15461548

15471549
def distribute_aars(self, arch):
15481550
'''Process existing .aar bundles and copy to current dist dir.'''
15491551
info('Unpacking aars')
1550-
for aar in glob.glob(join(self.ctx.aars_dir, '*.aar')):
1552+
for aar in glob(join(self.ctx.aars_dir, '*.aar')):
15511553
self._unpack_aar(aar, arch)
15521554

15531555
def _unpack_aar(self, aar, arch):
@@ -1574,7 +1576,7 @@ def _unpack_aar(self, aar, arch):
15741576
debug(" from {}".format(so_src_dir))
15751577
debug(" to {}".format(so_tgt_dir))
15761578
ensure_dir(so_tgt_dir)
1577-
so_files = glob.glob(join(so_src_dir, '*.so'))
1579+
so_files = glob(join(so_src_dir, '*.so'))
15781580
for f in so_files:
15791581
shprint(sh.cp, '-a', f, so_tgt_dir)
15801582

@@ -2278,17 +2280,18 @@ def reduce_python_package(self, arch):
22782280
class CompiledComponentsPythonRecipe(PythonRecipe):
22792281
pre_build_ext = False
22802282

2281-
def install_arch(self, arch):
2283+
def build_arch(self, arch):
2284+
super(CompiledComponentsPythonRecipe, self).build_arch(arch)
22822285
self.build_compiled_components(arch)
2283-
super(CompiledComponentsPythonRecipe, self).install_arch(arch)
22842286

22852287
def build_compiled_components(self, arch):
22862288
info('Building compiled components in {}'.format(self.name))
22872289

22882290
env = self.get_recipe_env(arch)
22892291
with current_directory(self.get_build_dir(arch.arch)):
22902292
hostpython = sh.Command(self.ctx.hostpython)
2291-
shprint(hostpython, 'setup.py', 'build_ext', '-v')
2293+
shprint(hostpython, 'setup.py', 'build_ext', '-v',
2294+
_env=env)
22922295
build_dir = glob('build/lib.*')[0]
22932296
shprint(sh.find, build_dir, '-name', '"*.o"', '-exec',
22942297
env['STRIP'], '{}', ';', _env=env)

0 commit comments

Comments
 (0)
0