[Libreoffice-commits] .: sal/CppunitTest_sal_rtl_strings.mk
sal/CppunitTest_sal_rtl_strings.mk |5 + 1 file changed, 5 insertions(+) New commits: commit 8a66c8f557dd97250faef6bd68c0d57970eefe43 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Mon Mar 26 12:05:44 2012 +0200 sal_rtl_strings unittest depends on sal_textenc library there's a dlopen of it somewhere in sal's string classes diff --git a/sal/CppunitTest_sal_rtl_strings.mk b/sal/CppunitTest_sal_rtl_strings.mk index 8b267f2..f5127cb 100644 --- a/sal/CppunitTest_sal_rtl_strings.mk +++ b/sal/CppunitTest_sal_rtl_strings.mk @@ -42,4 +42,9 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sal_rtl_strings,\ $(gb_STDLIBS) \ )) +# the test uses the library created by Module_DLL +$(call gb_CppunitTest_get_target,sal_rtl_strings) : \ +$(call gb_Library_get_target,sal_textenc) + + # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/CppunitTest_sal_rtl_strings.mk
sal/CppunitTest_sal_rtl_strings.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cedaaf89d7d9c2e41650dcc4df07b2be24649826 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Mon Mar 26 17:41:33 2012 +0200 fix comment diff --git a/sal/CppunitTest_sal_rtl_strings.mk b/sal/CppunitTest_sal_rtl_strings.mk index f5127cb..0a00e8b 100644 --- a/sal/CppunitTest_sal_rtl_strings.mk +++ b/sal/CppunitTest_sal_rtl_strings.mk @@ -42,7 +42,7 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sal_rtl_strings,\ $(gb_STDLIBS) \ )) -# the test uses the library created by Module_DLL +# the test uses O(U)String capabilities that dlopen this lib $(call gb_CppunitTest_get_target,sal_rtl_strings) : \ $(call gb_Library_get_target,sal_textenc) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/CppunitTest_sal_rtl_strings.mk
sal/CppunitTest_sal_rtl_strings.mk |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) New commits: commit 0a08973de9e3431edb90633fcefdbaa1af7837fd Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Mar 26 19:10:36 2012 +0300 No separate sal_textenc library built for Android (As a low-hanging fruit to drop the shared library count by one... Each library less counts.) diff --git a/sal/CppunitTest_sal_rtl_strings.mk b/sal/CppunitTest_sal_rtl_strings.mk index 0a00e8b..fc384d6 100644 --- a/sal/CppunitTest_sal_rtl_strings.mk +++ b/sal/CppunitTest_sal_rtl_strings.mk @@ -42,9 +42,11 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sal_rtl_strings,\ $(gb_STDLIBS) \ )) -# the test uses O(U)String capabilities that dlopen this lib +# The test uses O(U)String capabilities that dlopen this lib +ifneq ($(OS),ANDROID) +# Except that on Android we don't build it separately $(call gb_CppunitTest_get_target,sal_rtl_strings) : \ $(call gb_Library_get_target,sal_textenc) - +endif # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
