Stack unwinding unit tests.
Bug: 17436734
(cherry picked from commit bee1993a14b47bc7acda544242f405ae45e42566)
Change-Id: I7205a862ba2c3b474e287f5e9c8982cef4610af9
diff --git a/tests/Android.mk b/tests/Android.mk
index dd43049..23a2cb3 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -88,7 +88,6 @@
search_test.cpp \
signal_test.cpp \
stack_protector_test.cpp \
- stack_unwinding_test.cpp \
stdatomic_test.cpp \
stdint_test.cpp \
stdio_test.cpp \
@@ -134,9 +133,6 @@
libBionicStandardTests_ldlibs_host := \
-lrt \
-libBionicStandardTests_whole_static_libraries := \
- libBionicUnwindTest \
-
module := libBionicStandardTests
module_tag := optional
build_type := target
@@ -146,25 +142,6 @@
include $(LOCAL_PATH)/Android.build.mk
# -----------------------------------------------------------------------------
-# Special stack unwinding test library compiled with special flags.
-# -----------------------------------------------------------------------------
-libBionicUnwindTest_cflags := \
- $(test_cflags) \
- -fexceptions \
- -fnon-call-exceptions \
-
-libBionicUnwindTest_src_files := \
- stack_unwinding_test_impl.c \
-
-module := libBionicUnwindTest
-module_tag := optional
-build_type := target
-build_target := STATIC_TEST_LIBRARY
-include $(LOCAL_PATH)/Android.build.mk
-build_type := host
-include $(LOCAL_PATH)/Android.build.mk
-
-# -----------------------------------------------------------------------------
# Fortify tests.
# -----------------------------------------------------------------------------
$(foreach compiler,gcc clang, \
@@ -247,8 +224,15 @@
atexit_test.cpp \
dlext_test.cpp \
dlfcn_test.cpp \
+ stack_unwinding_test.cpp \
+ stack_unwinding_test_impl.c \
bionic-unit-tests_cflags := $(test_cflags)
+
+bionic-unit-tests_conlyflags := \
+ -fexceptions \
+ -fnon-call-exceptions \
+
bionic-unit-tests_cppflags := $(test_cppflags)
bionic-unit-tests_ldflags := \