diff options
| author | Yabin Cui <yabinc@google.com> | 2015-01-20 12:02:21 -0800 |
|---|---|---|
| committer | Yabin Cui <yabinc@google.com> | 2015-01-20 14:32:07 -0800 |
| commit | 6104eb9fa7a23ef1ce779073eb8cd28194e4c164 (patch) | |
| tree | 9bf70ce5b2dc15fd1dbb3608932cae5a6f8e4cc6 | |
| parent | 1d7b3f3ccc4f2883cbc0fe677dff888c56c18996 (diff) | |
| download | android_bionic-6104eb9fa7a23ef1ce779073eb8cd28194e4c164.tar.gz android_bionic-6104eb9fa7a23ef1ce779073eb8cd28194e4c164.tar.bz2 android_bionic-6104eb9fa7a23ef1ce779073eb8cd28194e4c164.zip | |
Add target libbionic_gtest_main for cts test.
Bug: 17589740
Change-Id: I37f2d3fe72870b9dc867407fa1619c9a6fcd5cbb
| -rw-r--r-- | tests/Android.mk | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/tests/Android.mk b/tests/Android.mk index 38d85f848..3150655b9 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -212,19 +212,36 @@ build_type := host include $(LOCAL_PATH)/Android.build.mk # ----------------------------------------------------------------------------- +# Library of bionic customized gtest main function. +# ----------------------------------------------------------------------------- +libBionicGtestMain_src_files := gtest_main.cpp + +libBionicGtestMain_cflags := $(test_cflags) + +libBionicGtestMain_cppflags := $(test_cppflags) + +module := libBionicGtestMain +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 + +# ----------------------------------------------------------------------------- # Tests for the device using bionic's .so. Run with: # adb shell /data/nativetest/bionic-unit-tests/bionic-unit-tests32 # adb shell /data/nativetest/bionic-unit-tests/bionic-unit-tests64 # ----------------------------------------------------------------------------- bionic-unit-tests_whole_static_libraries := \ libBionicTests \ + libBionicGtestMain \ bionic-unit-tests_static_libraries := \ libtinyxml2 \ liblog \ bionic-unit-tests_src_files := \ - gtest_main.cpp \ atexit_test.cpp \ dl_test.cpp \ dlext_test.cpp \ @@ -268,6 +285,7 @@ include $(LOCAL_PATH)/Android.build.mk # ----------------------------------------------------------------------------- bionic-unit-tests-static_whole_static_libraries := \ libBionicTests \ + libBionicGtestMain \ bionic-unit-tests-static_static_libraries := \ libm \ @@ -277,9 +295,6 @@ bionic-unit-tests-static_static_libraries := \ libtinyxml2 \ liblog \ -bionic-unit-tests-static_src_files := \ - gtest_main.cpp \ - bionic-unit-tests-static_force_static_executable := true # libc and libc++ both define std::nothrow. libc's is a private symbol, but this @@ -302,7 +317,6 @@ include $(LOCAL_PATH)/Android.build.mk ifeq ($(HOST_OS)-$(HOST_ARCH),$(filter $(HOST_OS)-$(HOST_ARCH),linux-x86 linux-x86_64)) bionic-unit-tests-glibc_src_files := \ - gtest_main.cpp \ atexit_test.cpp \ dlfcn_test.cpp \ dl_test.cpp \ @@ -315,6 +329,7 @@ bionic-unit-tests-glibc_shared_libraries += libdl_test_df_1_global bionic-unit-tests-glibc_whole_static_libraries := \ libBionicStandardTests \ + libBionicGtestMain \ bionic-unit-tests-glibc_ldlibs := \ -lrt -ldl -lutil \ |