StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support non-gtest NATIVE_TESTS

Browse Source 
We've had this in Soong for a while, but never supported it in Make.

Bug: 33819328
Test: Change LOCAL_GTEST on a module, check m -j ... showcommands
Change-Id: Id8f4b9908c82c05d9a986a38945b33bac578e991
This commit is contained in:
Dan Willemsen
2016-12-21 20:27:06 -08:00
parent 0ced0a1f50
commit 9416c20b79
3 changed files with 15 additions and 10 deletions
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:=

2
core/host_test_internal.mk
View File

@@ -2,6 +2,7 @@
## Shared definitions for all host test compilations. ## Shared definitions for all host test compilations.
##################################################### #####################################################
ifeq ($(LOCAL_GTEST),true)
LOCAL_CFLAGS_windows += -DGTEST_OS_WINDOWS LOCAL_CFLAGS_windows += -DGTEST_OS_WINDOWS
LOCAL_CFLAGS_linux += -DGTEST_OS_LINUX LOCAL_CFLAGS_linux += -DGTEST_OS_LINUX
LOCAL_LDLIBS_linux += -lpthread LOCAL_LDLIBS_linux += -lpthread
@@ -11,6 +12,7 @@ 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))

2
core/target_test_internal.mk
View File

@@ -2,6 +2,7 @@
## Shared definitions for all target test compilations. ## Shared definitions for all target test compilations.
####################################################### #######################################################
ifeq ($(LOCAL_GTEST),true)
LOCAL_CFLAGS += -DGTEST_OS_LINUX_ANDROID -DGTEST_HAS_STD_STRING LOCAL_CFLAGS += -DGTEST_OS_LINUX_ANDROID -DGTEST_HAS_STD_STRING
ifndef LOCAL_SDK_VERSION ifndef LOCAL_SDK_VERSION
@@ -20,6 +21,7 @@ else
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
$(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))