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

Merge "Add target libbionic_gtest_main for cts test."

Browse Source
This commit is contained in:
Yabin Cui 2015-01-20 22:44:01 +00:00 committed by Gerrit Code Review
commit 1c01c9f752
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tests/Android.mk
View File

@ -211,6 +211,23 @@ include $(LOCAL_PATH)/Android.build.mk
build_type := host build_type := host
include $(LOCAL_PATH)/Android.build.mk 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: # 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-tests32
@ -218,13 +235,13 @@ include $(LOCAL_PATH)/Android.build.mk
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
bionic-unit-tests_whole_static_libraries := \ bionic-unit-tests_whole_static_libraries := \
libBionicTests \ libBionicTests \
libBionicGtestMain \
bionic-unit-tests_static_libraries := \ bionic-unit-tests_static_libraries := \
libtinyxml2 \ libtinyxml2 \
liblog \ liblog \
bionic-unit-tests_src_files := \ bionic-unit-tests_src_files := \
gtest_main.cpp \
atexit_test.cpp \ atexit_test.cpp \
dl_test.cpp \ dl_test.cpp \
dlext_test.cpp \ dlext_test.cpp \
@ -268,6 +285,7 @@ include $(LOCAL_PATH)/Android.build.mk
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
bionic-unit-tests-static_whole_static_libraries := \ bionic-unit-tests-static_whole_static_libraries := \
libBionicTests \ libBionicTests \
libBionicGtestMain \
bionic-unit-tests-static_static_libraries := \ bionic-unit-tests-static_static_libraries := \
libm \ libm \
@ -277,9 +295,6 @@ bionic-unit-tests-static_static_libraries := \
libtinyxml2 \ libtinyxml2 \
liblog \ liblog \
bionic-unit-tests-static_src_files := \
gtest_main.cpp \
bionic-unit-tests-static_force_static_executable := true bionic-unit-tests-static_force_static_executable := true
# libc and libc++ both define std::nothrow. libc's is a private symbol, but this # 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)) ifeq ($(HOST_OS)-$(HOST_ARCH),$(filter $(HOST_OS)-$(HOST_ARCH),linux-x86 linux-x86_64))
bionic-unit-tests-glibc_src_files := \ bionic-unit-tests-glibc_src_files := \
gtest_main.cpp \
atexit_test.cpp \ atexit_test.cpp \
dlfcn_test.cpp \ dlfcn_test.cpp \
dl_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 := \ bionic-unit-tests-glibc_whole_static_libraries := \
libBionicStandardTests \ libBionicStandardTests \
libBionicGtestMain \
bionic-unit-tests-glibc_ldlibs := \ bionic-unit-tests-glibc_ldlibs := \
-lrt -ldl -lutil \ -lrt -ldl -lutil \