diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-16 17:39:23 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-17 15:22:55 +0200 |
| commit | 49a6efd9d9d0c700651d90b20559f3ceeeb7c8ce (patch) | |
| tree | 58f0a686dae4f1828c60360854379e37dcbee823 /sal | |
| parent | 73ee896b61ab4e67fb951aab92ee247916ee5b76 (diff) | |
Copy more shared objects for unit testing
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/android/Makefile | 52 |
1 files changed, 41 insertions, 11 deletions
diff --git a/sal/osl/android/Makefile b/sal/osl/android/Makefile index 2a606c49b579..1fb7aa1e371b 100644 --- a/sal/osl/android/Makefile +++ b/sal/osl/android/Makefile @@ -1,21 +1,51 @@ NDK_HOME:=$(shell type -p ndk-build) NDK_HOME:=$(shell dirname $(NDK_HOME)) +SODEST=libs/armeabi-v7a + all: ndk-build V=1 +# # Copy shared libraries we need to libs/armeabi-v7a so that ant will -# include them in the .apk - cp ../../unxandr.pro/bin/cppunittester libs/armeabi-v7a/libcppunittester.so - cp ../../../solver/unxandr.pro/lib/libcppunit-1.12.so libs/armeabi-v7a - cp ../../unxandr.pro/lib/*.so libs/armeabi-v7a - cp $(NDK_HOME)/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_shared.so libs/armeabi-v7a +# include them in the .apk. +# First ones from here, sal + cp ../../$(INPATH)/bin/cppunittester $(SODEST)/libcppunittester.so +# +# Then the cppunit library + cp $(OUTDIR)/lib/libcppunit-1.12.so $(SODEST) +# +# Then cppunit "plug-ins", first ones from sal +# + cp ../../$(INPATH)/lib/*.so $(SODEST) +# +# Then ones from other modules. Note that depending on when you try +# this, these might not have been built yet. +# + -for F in $(SRC_ROOT)/cppu/$(INPATH)/lib/qa_*.so; do \ + test -f $${F} && cp $${F} $(SODEST); \ + done +# + -for F in i18npool_test_breakiterator; do \ + test -f $(WORKDIR)/LinkTarget/CppunitTest/libtest_$${F}.so && cp $(WORKDIR)/LinkTarget/CppunitTest/libtest_$${F}.so $(SODEST); \ + done +# +# Then libs that the tests from other modules need. +# + -for F in libuno_cppu libuno_salhelpergcc3 libuno_cppuhelpergcc3; do \ + test -f $(OUTDIR)/lib/$${F}.so && cp $(OUTDIR)/lib/$${F}.so $(SODEST); \ + done +# +# Then the shared GNU C++ library + cp $(NDK_HOME)/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_shared.so $(SODEST) +# # Copy them to obj/local/armeabi-v7a, too, where gdb will look for -# them. Not sure if this is useful or not; I have great problems with -# ndk-gdb. - cp ../../unxandr.pro/bin/cppunittester obj/local/armeabi-v7a/libcppunittester.so - cp ../../../solver/unxandr.pro/lib/libcppunit-1.12.so obj/local/armeabi-v7a - cp ../../unxandr.pro/lib/*.so obj/local/armeabi-v7a - cp $(NDK_HOME)/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_shared.so obj/local/armeabi-v7a +# them. Not sure if this is useful or not; I have great problems with +# ndk-gdb. Actually, commenting out this part for now... +# +# cp ../../$(INPATH)/bin/cppunittester obj/local/armeabi-v7a/libcppunittester.so +# cp $(OUTPATH)/lib/libcppunit-1.12.so obj/local/armeabi-v7a +# cp ../../$(INPATH)/lib/*.so obj/local/armeabi-v7a +# cp $(NDK_HOME)/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_shared.so obj/local/armeabi-v7a unset JAVA_HOME && ant debug @echo 'Install it on the device with ant debug install' @echo 'Then run it with something like what "make run" does (see Makefile)' |