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

7 files changed, 0 insertions, 29 deletions

diff --git a/basebmp/CppunitTest_basebmp.mk b/basebmp/CppunitTest_basebmp.mk
index ff20ac09ae1c..9f55ba1d390e 100644
--- a/basebmp/CppunitTest_basebmp.mk
+++ b/basebmp/CppunitTest_basebmp.mk
@@ -16,15 +16,9 @@ $(eval $(call gb_CppunitTest_set_include,basebmp_cpputest,\
 
 $(eval $(call gb_CppunitTest_use_external,basebmp_cpputest,boost_headers))
 
-ifeq ($(OS),ANDROID)
-$(eval $(call gb_CppunitTest_use_static_libraries,basebmp_cpputest,\
-    basebmp \
-))
-else
 $(eval $(call gb_CppunitTest_use_libraries,basebmp_cpputest,\
     basebmp \
 ))
-endif
 
 $(eval $(call gb_CppunitTest_use_libraries,basebmp_cpputest,\
     basegfx \
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:
diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk
index 521b6e05cfaa..8a2a1c72de05 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -76,9 +76,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_filters_test, \
     utl \
     vcl \
     xo \
-	$(if $(filter $(OS),ANDROID), \
-		lo-bootstrap \
-	) \
 	$(gb_UWINAPI) \
 ))
 
diff --git a/sc/CppunitTest_sc_subsequent_export_test.mk b/sc/CppunitTest_sc_subsequent_export_test.mk
index 56fd35d38094..e5791b5b1e26 100644
--- a/sc/CppunitTest_sc_subsequent_export_test.mk
+++ b/sc/CppunitTest_sc_subsequent_export_test.mk
@@ -70,9 +70,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_subsequent_export_test, \
     utl \
     vcl \
     xo \
-	$(if $(filter $(OS),ANDROID), \
-		lo-bootstrap \
-	) \
 	$(gb_UWINAPI) \
 ))
 
@@ -133,12 +130,10 @@ $(eval $(call gb_CppunitTest_use_components,sc_subsequent_export_test,\
     xmlsecurity/util/xsec_xmlsec.windows \
 ))
 else
-ifneq ($(filter-out IOS ANDROID,$(OS)),) #FIXME: get nss&xmlsec building
 $(eval $(call gb_CppunitTest_use_components,sc_subsequent_export_test,\
     xmlsecurity/util/xsec_xmlsec \
 ))
 endif
-endif
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_subsequent_export_test))
 
diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk
index f6ea8626d69a..b0c99c8ef877 100644
--- a/sc/CppunitTest_sc_subsequent_filters_test.mk
+++ b/sc/CppunitTest_sc_subsequent_filters_test.mk
@@ -70,9 +70,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_subsequent_filters_test, \
     utl \
     vcl \
     xo \
-	$(if $(filter $(OS),ANDROID), \
-		lo-bootstrap \
-	) \
 	$(gb_UWINAPI) \
 ))
 
@@ -134,12 +131,10 @@ $(eval $(call gb_CppunitTest_use_components,sc_subsequent_filters_test,\
     xmlsecurity/util/xsec_xmlsec.windows \
 ))
 else
-ifneq ($(filter-out IOS ANDROID,$(OS)),) #FIXME: get nss&xmlsec building
 $(eval $(call gb_CppunitTest_use_components,sc_subsequent_filters_test,\
     xmlsecurity/util/xsec_xmlsec \
 ))
 endif
-endif
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_subsequent_filters_test))