commit 1672b0563693eaaf92db4f304308d456a6102e64
author Christopher Ferris <cferris@google.com> Fri May 30 03:53:00 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 30 03:53:00 2014 +0000
tree f581c3564b570c78697553cfc3527b1d609b78dd
parent 941707429d8577e90580277c51ad8a354f664586
parent d178c83d45ef5ff5caa6f8e92d461ada72c37bd2

Merge "Fix unwinding_through_signal_frame test."

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index d753acc..b75964a 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -86,7 +86,6 @@
     signal_test.cpp \
     stack_protector_test.cpp \
     stack_unwinding_test.cpp \
-    stack_unwinding_test_impl.c \
     stdatomic_test.cpp \
     stdint_test.cpp \
     stdio_test.cpp \
@@ -121,6 +120,9 @@
 libBionicStandardTests_ldlibs_host := \
     -lrt \
 
+libBionicStandardTests_whole_static_libraries := \
+    libBionicUnwindTest \
+
 module := libBionicStandardTests
 module_tag := optional
 build_type := target
@@ -130,6 +132,25 @@
 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, \