From e205ba1860f62e3ac7d7dd41319428c0a8d10b4e Mon Sep 17 00:00:00 2001 From: Ryan Pessa Date: Wed, 8 Jun 2016 09:57:25 -0500 Subject: [PATCH] fix jpeg build by merging libjpeg.a and libsimd.a --- pythonforandroid/recipes/jpeg/__init__.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pythonforandroid/recipes/jpeg/__init__.py b/pythonforandroid/recipes/jpeg/__init__.py index adfd78e818..052a735f32 100644 --- a/pythonforandroid/recipes/jpeg/__init__.py +++ b/pythonforandroid/recipes/jpeg/__init__.py @@ -1,5 +1,6 @@ from pythonforandroid.recipe import NDKRecipe from pythonforandroid.logger import shprint +from pythonforandroid.util import current_directory from os.path import join, exists import sh @@ -24,5 +25,11 @@ def prebuild_arch(self, arch): if not exists(jni_ln): shprint(sh.ln, '-s', build_dir, jni_ln) + def build_arch(self, arch): + super(JpegRecipe, self).build_arch(arch) + with current_directory(self.get_lib_dir(arch)): + shprint(sh.mv, 'libjpeg.a', 'libjpeg-orig.a') + shprint(sh.ar, '-rcT', 'libjpeg.a', 'libjpeg-orig.a', 'libsimd.a') + recipe = JpegRecipe()