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

Commit 5eb8f653 authored by Dan Albert's avatar Dan Albert Committed by android-build-merger
Browse files

Merge "Update NDK gtest lib names." am: 56c2a18a 

am: 146540b5

Change-Id: I32717473ff1d38f8abca819eb0b21ccfc9153d59
parents 64deaba8 146540b5

core/target_test_internal.mk

+3 −3
Original line number Diff line number Diff line
@@ -8,13 +8,13 @@ ifndef LOCAL_SDK_VERSION 
    LOCAL_STATIC_LIBRARIES += libgtest_main libgtest

else

    ifneq (,$(filter c++_%,$(LOCAL_NDK_STL_VARIANT)))

        my_ndk_gtest_suffix := _libcxx

        my_ndk_gtest_suffix := _c++

    else ifneq ($(filter stlport_,$(LOCAL_NDK_STL_VARIANT)),)

        my_ndk_gtest_suffix :=

        my_ndk_gtest_suffix := _stlport

    else ifneq ($(filter gnustl_,$(LOCAL_NDK_STL_VARIANT)),)

        my_ndk_gtest_suffix := _gnustl

    else # system STL, use stlport

        my_ndk_gtest_suffix :=

        my_ndk_gtest_suffix := _stlport

    endif

    LOCAL_STATIC_LIBRARIES += \

        libgtest_main_ndk$(my_ndk_gtest_suffix) \