diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-10 00:19:09 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-10 01:23:45 +0200 |
| commit | aafe4bd7f63ff59b9cde725701ccd0d8868a68bc (patch) | |
| tree | d57a0851fb1241deb1642eb318601b3fb1ceaaf1 /cppunit | |
| parent | b737dad012e743671654dfa6d1a6bc6cd90add15 (diff) | |
We want Android shared objects to have names ending in .so
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.
Diffstat (limited to 'cppunit')
| -rw-r--r-- | cppunit/android.patch | 16 | ||||
| -rw-r--r-- | cppunit/makefile.mk | 8 | ||||
| -rw-r--r-- | cppunit/prj/d.lst | 3 |
3 files changed, 25 insertions, 2 deletions
diff --git a/cppunit/android.patch b/cppunit/android.patch index e7a188c811aa..7d88a82cfbef 100644 --- a/cppunit/android.patch +++ b/cppunit/android.patch @@ -18,4 +18,18 @@ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ -
\ No newline at end of file +--- 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 diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk index fe7f3f065e00..c4b7bba920cc 100644 --- a/cppunit/makefile.mk +++ b/cppunit/makefile.mk @@ -34,12 +34,16 @@ TARFILE_MD5=bd30e9cf5523cdfc019b94f5e1d7fd19 # from <https://sourceforge.net/projects/cppunit/files/cppunit/1.12.1/ # cppunit-1.12.1.tar.gz/download> -PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch aix.patch avoid-synthetised-destructor.patch android.patch ios.patch +PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch aix.patch avoid-synthetised-destructor.patch ios.patch # solarisfinite.patch: see <https://sourceforge.net/tracker/?func=detail& # aid=2912590&group_id=11795&atid=311795> # warnings.patch: see <https://sourceforge.net/tracker/?func=detail& # aid=2912630&group_id=11795&atid=311795> +.IF "$(OS)" == "ANDROID" +PATCH_FILES += android.patch +.ENDIF + .IF "$(OS)" == "WNT" .IF "$(COM)" == "MSC" @@ -165,6 +169,8 @@ OUT2LIB = ooo-install/lib/libcppunit-1.12.a OUT2LIB = ooo-install/lib/libcppunit-1.12.so.1.0 .ELIF "$(OS)" == "IOS" OUT2LIB = ooo-install/lib/libcppunit.a +.ELIF "$(OS)" == "ANDROID" +OUT2LIB = ooo-install/lib/libcppunit-1.12.so .ELSE OUT2LIB = ooo-install/lib/libcppunit-1.12.so.1 .END diff --git a/cppunit/prj/d.lst b/cppunit/prj/d.lst index 97e710d446b9..7235dfa52817 100644 --- a/cppunit/prj/d.lst +++ b/cppunit/prj/d.lst @@ -22,6 +22,9 @@ mkdir: %_DEST%\inc\cppunit\ui\text ..\%__SRC%\lib\libcppunit-1.12.1.dylib %_DEST%\lib\libcppunit-1.12.1.dylib symlink: %_DEST%\lib\libcppunit-1.12.1.dylib %_DEST%\lib\libcppunit.dylib +..\%__SRC%\lib\libcppunit-1.12.so %_DEST%\lib\libcppunit-1.12.so +symlink: %_DEST%\lib\libcppunit-1.12.so %_DEST%\lib\libcppunit.so + ..\%__SRC%\lib\libcppunit-1.12.so.1 %_DEST%\lib\libcppunit-1.12.so.1 symlink: %_DEST%\lib\libcppunit-1.12.so.1 %_DEST%\lib\libcppunit.so |