From 0b2eae62f1ccaad1c963d2637aafaa1ce9062455 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 15 Apr 2013 21:15:10 +0300 Subject: 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 --- sc/CppunitTest_sc_subsequent_export_test.mk | 5 ----- 1 file changed, 5 deletions(-) (limited to 'sc/CppunitTest_sc_subsequent_export_test.mk') 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)) -- cgit