summaryrefslogtreecommitdiff
path: root/sal
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-04-15 21:15:10 +0300
committerTor Lillqvist <tml@iki.fi>2013-04-15 21:37:50 +0300
commit0b2eae62f1ccaad1c963d2637aafaa1ce9062455 (patch)
tree8624e961142cac8da29875cb723b23662f02c9c7 /sal
parentca3392e833ef932664e236eafddeff874eb95d70 (diff)
No need for Android, iOS or CROSS_COMPILING conditionals for unit tests
We don't run unit tests when cross-compiling anyway and since d4ea8c6b7ee32dfbe1525cae45ad44d411052c33 the corresponding .mk files aren't even read by Make. Change-Id: Icbee9ad51841d515a551e67708d9594358ce7e71
Diffstat (limited to 'sal')
-rw-r--r--sal/CppunitTest_sal_rtl_strings.mk3
-rw-r--r--sal/CppunitTest_sal_rtl_textenc.mk3
-rw-r--r--sal/CppunitTest_sal_rtl_uri.mk4
3 files changed, 0 insertions, 10 deletions
diff --git a/sal/CppunitTest_sal_rtl_strings.mk b/sal/CppunitTest_sal_rtl_strings.mk
index 1d56ecd06c7d..b522cbe41ece 100644
--- a/sal/CppunitTest_sal_rtl_strings.mk
+++ b/sal/CppunitTest_sal_rtl_strings.mk
@@ -48,10 +48,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_strings,\
))
# 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:
diff --git a/sal/CppunitTest_sal_rtl_textenc.mk b/sal/CppunitTest_sal_rtl_textenc.mk
index 40167a28fb1a..e9b0c994cbbc 100644
--- a/sal/CppunitTest_sal_rtl_textenc.mk
+++ b/sal/CppunitTest_sal_rtl_textenc.mk
@@ -20,10 +20,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_textenc,\
))
# 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_textenc) : \
$(call gb_Library_get_target,sal_textenc)
-endif
# vim: set noet sw=4 ts=4:
diff --git a/sal/CppunitTest_sal_rtl_uri.mk b/sal/CppunitTest_sal_rtl_uri.mk
index 65b6713a6608..3e457b0fb527 100644
--- a/sal/CppunitTest_sal_rtl_uri.mk
+++ b/sal/CppunitTest_sal_rtl_uri.mk
@@ -26,11 +26,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_uri,\
))
# 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_uri) : \
$(call gb_Library_get_target,sal_textenc)
-endif
-
# vim: set noet sw=4 ts=4: