diff options
| author | Christopher Ferris <cferris@google.com> | 2013-08-29 11:37:33 -0700 |
|---|---|---|
| committer | Christopher Ferris <cferris@google.com> | 2013-09-23 12:16:19 -0700 |
| commit | 34c2a9fc37848d446bf91ce61783884232fffeb1 (patch) | |
| tree | 0bc05ae33767a75ad212243fd3cde1dd980efb18 | |
| parent | f4af911065b1b392085b857b891e5496bc75f478 (diff) | |
| download | bionic-34c2a9fc37848d446bf91ce61783884232fffeb1.tar.gz | |
Move stack unwinding test into library.
Bug: 8291716
(cherry picked from commit 8240bed918722944c9985bc0cca89eb44c4f6c91)
Change-Id: I1da2d0757ed304c352229f9818c052925d4e976a
| -rw-r--r-- | tests/Android.mk | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/tests/Android.mk b/tests/Android.mk index 400d97923..534aa3017 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -124,7 +124,7 @@ LOCAL_MODULE := bionic-unit-tests-static LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_FORCE_STATIC_EXECUTABLE := true LOCAL_WHOLE_STATIC_LIBRARIES += libBionicTests -LOCAL_STATIC_LIBRARIES += libstlport_static libstdc++ libm libc bionic-unit-tests-unwind-test-impl +LOCAL_STATIC_LIBRARIES += libstlport_static libstdc++ libm libc include $(BUILD_NATIVE_TEST) # ----------------------------------------------------------------------------- @@ -137,9 +137,19 @@ LOCAL_MODULE := libBionicTests LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_CFLAGS += $(test_c_flags) LOCAL_SRC_FILES := $(test_src_files) -LOCAL_CFLAGS += -DGTEST_OS_LINUX_ANDROID -DGTEST_HAS_STD_STRING -LOCAL_C_INCLUDES += bionic bionic/libstdc++/include external/gtest/include external/stlport/stlport -LOCAL_WHOLE_STATIC_LIBRARIES := $(test_fortify_static_libraries) +LOCAL_CFLAGS += \ + -DGTEST_OS_LINUX_ANDROID \ + -DGTEST_HAS_STD_STRING \ + +LOCAL_C_INCLUDES += \ + bionic bionic/libstdc++/include \ + external/gtest/include \ + external/stlport/stlport \ + +LOCAL_WHOLE_STATIC_LIBRARIES := \ + $(test_fortify_static_libraries) \ + bionic-unit-tests-unwind-test-impl \ + include $(BUILD_STATIC_LIBRARY) # ----------------------------------------------------------------------------- |