Ethan Hugg
df6f92096a
Merge pull request #330 from mstorsjo/android-build-fixes
...
Android build fixes/cleanups
2014-02-20 15:39:22 -08:00
Martin Storsjö
a8a2c5eaba
Move LDFLAGS specific to creating a shared library to SHLDFLAGS
2014-02-20 12:28:00 +02:00
Martin Storsjö
f6126a0bb8
Don't add C++ specific compiler flags to CFLAGS, add them to CXXFLAGS
2014-02-20 12:28:00 +02:00
Martin Storsjö
0fc2b6d14e
Set the CC and AR tools when building for android as well
2014-02-20 12:28:00 +02:00
Martin Storsjö
64c2164df9
Fix building the gtest library when targeting android
...
The main purpose is to make sure that the build doesn't fail
if the build directory contains the gtest subdirectory, although
the unittests also could be run on a device.
2014-02-20 12:28:00 +02:00
Martin Storsjö
fc06d8783b
Pass the right -mfpu flags for the armeabi-v7a target without NEON
2014-02-20 12:28:00 +02:00
Martin Storsjö
b5a9a83c69
Run ndk-build from the android project top level directory
...
One doesn't need to run the ndk-build command from within the
jni subdirectory, calling it from the project top level directory
works just as well.
Also remove an unnecessary step of cd ../../../.. at the end -
since all make commands are run in a subshell, we don't need to
restore the current working directory afterwards.
2014-02-20 12:28:00 +02:00
Martin Storsjö
6ac6b941cf
Don't quote the android building commands in sh -c ''
...
The full command line can be written as such without any extra
wrapping.
2014-02-20 12:28:00 +02:00
Martin Storsjö
4d31f66873
Chain build commands using && instead of ;
...
This makes sure the build aborts as soon as possible if there is an
error, instead of having the error message drown in all the
following output.
2014-02-20 12:28:00 +02:00
Martin Storsjö
317eb437b0
Enable x86 assembly by default if building for x86 android
...
Most users would probably miss enabling it otherwise.
It can still be disabled manually by passing USE_ASM=No on the
make command line.
2014-02-20 11:23:41 +02:00
Licai Guo
538d22560f
refine android build, add TARGET option to specify target in sdk
2014-02-19 20:49:30 -08:00
Licai Guo
f6e4ed6524
enable x86 asm for android
2014-02-19 17:31:21 -08:00
Licai Guo
d058176c3b
add android support, single commit
2014-02-18 17:54:27 -08:00
