Fix bug for recursive/errorcheck mutex on 32-bit devices.
Bug: 19216648
Change-Id: I3b43b2d18d25b9bde352da1e35f9568133dec7cf
diff --git a/tests/Android.mk b/tests/Android.mk
index 995877e..c942375 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -128,6 +128,9 @@
bionic/libc \
external/tinyxml2 \
+libBionicStandardTests_static_libraries := \
+ libbase \
+
libBionicStandardTests_ldlibs_host := \
-lrt \
@@ -257,6 +260,7 @@
bionic-unit-tests_static_libraries := \
libtinyxml2 \
liblog \
+ libbase \
# TODO: Include __cxa_thread_atexit_test.cpp to glibc tests once it is upgraded (glibc 2.18+)
bionic-unit-tests_src_files := \
@@ -317,6 +321,7 @@
libdl \
libtinyxml2 \
liblog \
+ libbase \
bionic-unit-tests-static_force_static_executable := true
@@ -355,6 +360,11 @@
libBionicGtestMain \
$(fortify_libs) \
+bionic-unit-tests-glibc_static_libraries := \
+ libbase \
+ liblog \
+ libcutils \
+
bionic-unit-tests-glibc_ldlibs := \
-lrt -ldl -lutil \