Add support for NDK/toolchains cloned from git about android-cmake

[taka-no-me]

Hi, and thanks for the report!

It would be interesting to support Linaro's NDK. The toolchain file from apitrace is older than master of android-cmake and your patch can't be directly applied so I have created an alternative one: 62bcf2b

Currently two options are needed to use a git cloned NDK:

-DANDROID_NDK=$(TOPDIR)/prebuilt/ndk/android-ndk-r8 -DANDROID_NDK_LAYOUT=LINARO

I think I will do few more tweaks in this branch and then merge it to master.

[vasild]

Hi,

I tested the new version of the toolchain. It works, but I had to add -DANDROID_NO_UNDEFINED=OFF to the cmake command line, otherwise I get:

...
prebuilt/ndk/android-ndk-r8/../../linux-x86/toolchain/arm-linux-androideabi-4.4.x/bin/../lib/gcc/arm-linux-androideabi/4.4.3/../../../../arm-linux-androideabi/bin/ld: CMakeFiles/egltrace.dir/egltrace.cpp.o: in function __static_initialization_and_destruction_0(int, int):egltrace.cpp(.text._Z41__static_initialization_and_destruction_0ii+0x5fc): error: undefined reference to '__dso_handle'

Thanks!

[taka-no-me]

"undefined __dso_handle" message usually means some problem with crt linkage..

Could you post full CMake command you used?

[vasild]

Here are all the commands to repro:

cd /tmp
git clone git://android.git.linaro.org/platform/prebuilt # huuuge
git clone git://github.com/apitrace/apitrace.git
cd apitrace
cmake -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain/android.toolchain.cmake -DANDROID_NDK=/tmp/prebuilt/ndk/android-ndk-r8 -DANDROID_NDK_LAYOUT=LINARO -DANDROID_API_LEVEL=9 -H. -B/tmp/0
make -C /tmp/0

(cmake/toolchain/android.toolchain.cmake inside apitrace directory was just recently pulled from 62bcf2b)

One way to make that undefined reference to '__dso_handle' go away is to add -DANDROID_NO_UNDEFINED=OFF to cmake command line, another one is to include crt_whatever.o on the ld command line. A quick googling shows that this err was caused by some recent changes in Android.

[taka-no-me]

Thanks, I'll look at it.

[taka-no-me]

Hi, I've committed fixes for remaining problems. 07dc8e7 works for me without extra CMake flags.

[vasild]

Thank you!