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

Commit 3a0a8918 authored by Colin Cross's avatar Colin Cross
Browse files

Link libgtest_main before libgtest 

libgtest_main uses symbols from libgtest.  If libgtest_main is linked
after libgtest, and the test .o files don't reference libgtest (which is
unlikely), then the libgtest .o files will be ignored and libgtest_main
won't be able to find its symbols from libgtest.

Change-Id: Ica3bc679bd9d14e9a3065be927f085cf52faab64
parent 0d97557d

core/host_test_internal.mk

+1 −1
Original line number Diff line number Diff line
@@ -11,4 +11,4 @@ LOCAL_LDLIBS_darwin += -lpthread 
LOCAL_CFLAGS += -DGTEST_HAS_STD_STRING -O0 -g

LOCAL_C_INCLUDES +=  external/gtest/include



LOCAL_STATIC_LIBRARIES += libgtest_host libgtest_main_host
 
LOCAL_STATIC_LIBRARIES += libgtest_main_host libgtest_host

core/target_test_internal.mk

+2 −2
Original line number Diff line number Diff line
@@ -7,9 +7,9 @@ LOCAL_CFLAGS += -DGTEST_OS_LINUX_ANDROID -DGTEST_HAS_STD_STRING 
LOCAL_C_INCLUDES += external/gtest/include



ifndef LOCAL_SDK_VERSION

LOCAL_STATIC_LIBRARIES += libgtest libgtest_main

LOCAL_STATIC_LIBRARIES += libgtest_main libgtest

else

LOCAL_STATIC_LIBRARIES += libgtest_ndk libgtest_main_ndk

LOCAL_STATIC_LIBRARIES += libgtest_main_ndk libgtest_ndk

endif



ifdef LOCAL_MODULE_PATH