summaryrefslogtreecommitdiff
path: root/basebmp/CppunitTest_basebmp.mk
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 /basebmp/CppunitTest_basebmp.mk
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 'basebmp/CppunitTest_basebmp.mk')
-rw-r--r--basebmp/CppunitTest_basebmp.mk6
1 files changed, 0 insertions, 6 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 \