generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am fc24bc25: am 99b859cf: Merge "Move stack unwinding test into library."

Browse Source 
* commit 'fc24bc2544edad03798a1c69d6a76259e6f1e7dd':
  Move stack unwinding test into library.
This commit is contained in:
Christopher Ferris 2013-08-29 14:18:41 -07:00 committed by Android Git Automerger
commit 7a80982913
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/Android.mk
View File

@ -124,7 +124,7 @@ LOCAL_MODULE := bionic-unit-tests-static
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_FORCE_STATIC_EXECUTABLE := true LOCAL_FORCE_STATIC_EXECUTABLE := true
LOCAL_WHOLE_STATIC_LIBRARIES += libBionicTests 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) include $(BUILD_NATIVE_TEST)
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
@ -137,9 +137,19 @@ LOCAL_MODULE := libBionicTests
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_CFLAGS += $(test_c_flags) LOCAL_CFLAGS += $(test_c_flags)
LOCAL_SRC_FILES := $(test_src_files) LOCAL_SRC_FILES := $(test_src_files)
LOCAL_CFLAGS += -DGTEST_OS_LINUX_ANDROID -DGTEST_HAS_STD_STRING LOCAL_CFLAGS += \
LOCAL_C_INCLUDES += bionic bionic/libstdc++/include external/gtest/include external/stlport/stlport -DGTEST_OS_LINUX_ANDROID \
LOCAL_WHOLE_STATIC_LIBRARIES := $(test_fortify_static_libraries) -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) include $(BUILD_STATIC_LIBRARY)
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------