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

Commit f5d024d3 authored by Dan Albert's avatar Dan Albert
Browse files

Update NDK gtest lib names. 

The NDK gtest libs are always suffixed to simplify the make macro
that generates the test modules.

Bug: http://b/16574165
Change-Id: I1c9647e90aff2f1e9da4a88cad30199b1e423757
parent 6b363e24

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) \