aafe4bd7f6
The silly apkbuilder tool doesn't add extra native libs to an .apk package unless their name ends with .so. It just silently ignores them. So, force libtool to avoid versioning suffix for Android. Yeah, unclear whether apkbuilder is what we will end up using to construct the APKs of actual LO code using Android apps. But at this stage when just trying to build a unit testing app, it seems to be the simplest way to get the .apk properly signed and all to just use a normal Ant project, and let Ant run apkbuilder.
35 lines
1.5 KiB
Diff
35 lines
1.5 KiB
Diff
--- misc/cppunit-1.12.1/config/config.sub
|
|
+++ misc/build/cppunit-1.12.1/config/config.sub
|
|
@@ -120,7 +120,7 @@
|
|
# Here we must recognize all the valid KERNEL-OS combinations.
|
|
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
|
|
case $maybe_os in
|
|
- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
|
|
+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
|
|
uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
|
|
storm-chaos* | os2-emx* | rtmk-nova*)
|
|
os=-$maybe_os
|
|
@@ -1250,7 +1250,7 @@
|
|
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
|
|
| -chorusos* | -chorusrdb* \
|
|
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
|
|
- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
|
|
+ | -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \
|
|
| -uxpv* | -beos* | -mpeix* | -udk* \
|
|
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
|
|
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
|
|
--- misc/cppunit-1.12.1/config/ltmain.sh
|
|
+++ misc/build/cppunit-1.12.1/config/ltmain.sh
|
|
@@ -3228,6 +3228,12 @@
|
|
fi
|
|
else
|
|
|
|
+ # Force no versioning suffix for Android thanks to silly
|
|
+ # apkbuilder which doesn't add extra native libs unless their
|
|
+ # name ends with .so
|
|
+
|
|
+ version_type=none
|
|
+
|
|
# Parse the version information argument.
|
|
save_ifs="$IFS"; IFS=':'
|
|
set dummy $vinfo 0 0 0
|