Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27f489cd authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Support non-gtest NATIVE_TESTS" am: 561b0a37 am: 1ef51124 

am: 4ad881c0

Change-Id: Id4968904ba43183e38c04aa3cc83754bd599c1fb
parents b5852648 4ad881c0

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ LOCAL_GCNO_FILES:= 
LOCAL_GENERATED_SOURCES:=

# Group static libraries with "-Wl,--start-group" and "-Wl,--end-group" when linking.

LOCAL_GROUP_STATIC_LIBRARIES:=

LOCAL_GTEST:=true

LOCAL_HAL_STATIC_LIBRARIES:=

LOCAL_INIT_RC:=

LOCAL_INSTALLED_MODULE:=

core/host_test_internal.mk

+9 −7
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
## Shared definitions for all host test compilations.

#####################################################



ifeq ($(LOCAL_GTEST),true)

  LOCAL_CFLAGS_windows += -DGTEST_OS_WINDOWS

  LOCAL_CFLAGS_linux += -DGTEST_OS_LINUX

  LOCAL_LDLIBS_linux += -lpthread
@@ -11,6 +12,7 @@ LOCAL_LDLIBS_darwin += -lpthread 
  LOCAL_CFLAGS += -DGTEST_HAS_STD_STRING -O0 -g



  LOCAL_STATIC_LIBRARIES += libgtest_main_host libgtest_host

endif



ifdef LOCAL_MODULE_PATH

$(error $(LOCAL_PATH): Do not set LOCAL_MODULE_PATH when building test $(LOCAL_MODULE))

core/target_test_internal.mk

+5 −3
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
## Shared definitions for all target test compilations.

#######################################################



ifeq ($(LOCAL_GTEST),true)

  LOCAL_CFLAGS += -DGTEST_OS_LINUX_ANDROID -DGTEST_HAS_STD_STRING



  ifndef LOCAL_SDK_VERSION
@@ -20,6 +21,7 @@ else 
        libgtest_main_ndk$(my_ndk_gtest_suffix) \

        libgtest_ndk$(my_ndk_gtest_suffix)

  endif

endif



ifdef LOCAL_MODULE_PATH

$(error $(LOCAL_PATH): Do not set LOCAL_MODULE_PATH when building test $(LOCAL_MODULE))