diff options
| author | masoud bh <masoud.bh@chmail.ir> | 2015-09-16 16:14:38 +0430 |
|---|---|---|
| committer | masoud bh <masoud.bh@chmail.ir> | 2015-09-16 16:14:38 +0430 |
| commit | 867c95223d0e972b88aa26a3d8dc40530b02f09b (patch) | |
| tree | 13fa52d908ac5b03f4c802fb2673972b6b1b0ee8 /drivers/webp | |
| parent | 1931d228fa6c825c2fff4becacb69c96292e841c (diff) | |
Fix android build script
some fixes for android build script.
remove armv6,x86 options and add "android_arch" option for select
compiler architecture (armv7,armv6,x86)(default armv7).
add architecture suffix for output files and you can compile for several
architecture simultaneously.
example:
libgodot.android.opt.debug.armv7.so
libgodot.android.opt.debug.armv7.neon.so
libgodot.android.opt.debug.armv6.so
libgodot.android.opt.debug.x86.so
now we can enable/disable neon on armv7 with "android_neon" option
(default enable).
add "NDK_TARGET_X86" option for select toolchain to use for the NDK x86
(default x86-4.8).
change inputs model for "ndk_platform" option (default android-15).
fix armv7 ccflags.
with this patch, must put libgodot_android.so file in specific
architecture folder:
armv7 (default): <android-java>/libs/armeabi-v7a/
armv6: <android-java>/libs/armeabi/
x86: <android-java>/libs/x86/
Diffstat (limited to 'drivers/webp')
| -rw-r--r-- | drivers/webp/dsp/dsp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/webp/dsp/dsp.h b/drivers/webp/dsp/dsp.h index afe30413c6..fd686a8532 100644 --- a/drivers/webp/dsp/dsp.h +++ b/drivers/webp/dsp/dsp.h @@ -29,7 +29,7 @@ extern "C" { #define WEBP_USE_SSE2 #endif -#if defined(__ANDROID__) && defined(__ARM_ARCH_7A__) +#if defined(__ANDROID__) && defined(__ARM_ARCH_7A__) && defined(__ARM_NEON__) #define WEBP_ANDROID_NEON // Android targets that might support NEON #endif |