tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Support non-gtest NATIVE_TESTS"

Browse source
This commit is contained in:
Dan Willemsen 2016-12-22 20:29:41 +00:00 committed by Gerrit Code Review
commit 561b0a3753
3 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/clear_vars.mk
View file

@ -78,6 +78,7 @@ LOCAL_GCNO_FILES:=
LOCAL_GENERATED_SOURCES:= LOCAL_GENERATED_SOURCES:=
# Group static libraries with "-Wl,--start-group" and "-Wl,--end-group" when linking. # Group static libraries with "-Wl,--start-group" and "-Wl,--end-group" when linking.
LOCAL_GROUP_STATIC_LIBRARIES:= LOCAL_GROUP_STATIC_LIBRARIES:=
LOCAL_GTEST:=true
LOCAL_HAL_STATIC_LIBRARIES:= LOCAL_HAL_STATIC_LIBRARIES:=
LOCAL_INIT_RC:= LOCAL_INIT_RC:=
LOCAL_INSTALLED_MODULE:= LOCAL_INSTALLED_MODULE:=

16
core/host_test_internal.mk
View file

@ -2,15 +2,17 @@
## Shared definitions for all host test compilations. ## Shared definitions for all host test compilations.
##################################################### #####################################################
LOCAL_CFLAGS_windows += -DGTEST_OS_WINDOWS ifeq ($(LOCAL_GTEST),true)
LOCAL_CFLAGS_linux += -DGTEST_OS_LINUX LOCAL_CFLAGS_windows += -DGTEST_OS_WINDOWS
LOCAL_LDLIBS_linux += -lpthread LOCAL_CFLAGS_linux += -DGTEST_OS_LINUX
LOCAL_CFLAGS_darwin += -DGTEST_OS_MAC LOCAL_LDLIBS_linux += -lpthread
LOCAL_LDLIBS_darwin += -lpthread LOCAL_CFLAGS_darwin += -DGTEST_OS_MAC
LOCAL_LDLIBS_darwin += -lpthread
LOCAL_CFLAGS += -DGTEST_HAS_STD_STRING -O0 -g LOCAL_CFLAGS += -DGTEST_HAS_STD_STRING -O0 -g
LOCAL_STATIC_LIBRARIES += libgtest_main_host libgtest_host LOCAL_STATIC_LIBRARIES += libgtest_main_host libgtest_host
endif
ifdef LOCAL_MODULE_PATH ifdef LOCAL_MODULE_PATH
$(error $(LOCAL_PATH): Do not set LOCAL_MODULE_PATH when building test $(LOCAL_MODULE)) $(error $(LOCAL_PATH): Do not set LOCAL_MODULE_PATH when building test $(LOCAL_MODULE))

8
core/target_test_internal.mk
View file

@ -2,11 +2,12 @@
## Shared definitions for all target test compilations. ## Shared definitions for all target test compilations.
####################################################### #######################################################
LOCAL_CFLAGS += -DGTEST_OS_LINUX_ANDROID -DGTEST_HAS_STD_STRING ifeq ($(LOCAL_GTEST),true)
LOCAL_CFLAGS += -DGTEST_OS_LINUX_ANDROID -DGTEST_HAS_STD_STRING
ifndef LOCAL_SDK_VERSION ifndef LOCAL_SDK_VERSION
LOCAL_STATIC_LIBRARIES += libgtest_main libgtest LOCAL_STATIC_LIBRARIES += libgtest_main libgtest
else else
ifneq (,$(filter c++_%,$(LOCAL_NDK_STL_VARIANT))) ifneq (,$(filter c++_%,$(LOCAL_NDK_STL_VARIANT)))
my_ndk_gtest_suffix := _c++ my_ndk_gtest_suffix := _c++
else ifneq ($(filter stlport_,$(LOCAL_NDK_STL_VARIANT)),) else ifneq ($(filter stlport_,$(LOCAL_NDK_STL_VARIANT)),)
@ -19,6 +20,7 @@ else
LOCAL_STATIC_LIBRARIES += \ LOCAL_STATIC_LIBRARIES += \
libgtest_main_ndk$(my_ndk_gtest_suffix) \ libgtest_main_ndk$(my_ndk_gtest_suffix) \
libgtest_ndk$(my_ndk_gtest_suffix) libgtest_ndk$(my_ndk_gtest_suffix)
endif
endif endif
ifdef LOCAL_MODULE_PATH ifdef LOCAL_MODULE_PATH