diff options
| author | Christopher Ferris <cferris@google.com> | 2013-08-28 00:19:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-08-28 00:19:06 +0000 |
| commit | 1f216e30b6a9301211193d05f995cdefbdc9619f (patch) | |
| tree | a33fc33b65a03e3ab84939bd778b36d4f6139480 | |
| parent | 22f5ef6b84057bf56f023263859a9b45eccd620b (diff) | |
| parent | 153d92765bb693541abf49a2a1d31335e2c90348 (diff) | |
| download | bionic-1f216e30b6a9301211193d05f995cdefbdc9619f.tar.gz | |
Merge "Create bionic unit test library for use with CTS."
| -rw-r--r-- | tests/Android.mk | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/tests/Android.mk b/tests/Android.mk index 902bf6959..400d97923 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -122,14 +122,27 @@ include $(BUILD_NATIVE_TEST) include $(CLEAR_VARS) LOCAL_MODULE := bionic-unit-tests-static LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk -LOCAL_CFLAGS += $(test_c_flags) LOCAL_FORCE_STATIC_EXECUTABLE := true -LOCAL_SRC_FILES := $(test_src_files) +LOCAL_WHOLE_STATIC_LIBRARIES += libBionicTests LOCAL_STATIC_LIBRARIES += libstlport_static libstdc++ libm libc bionic-unit-tests-unwind-test-impl -LOCAL_WHOLE_STATIC_LIBRARIES := $(test_fortify_static_libraries) include $(BUILD_NATIVE_TEST) # ----------------------------------------------------------------------------- +# We build the static unit tests as a library so they can be used both for +# bionic-unit-tests-static and also as part of CTS. +# ----------------------------------------------------------------------------- + +include $(CLEAR_VARS) +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) +include $(BUILD_STATIC_LIBRARY) + +# ----------------------------------------------------------------------------- # Test library for the unit tests. # ----------------------------------------------------------------------------- |