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

Commit 696923ac authored by Ulas Kirazci's avatar Ulas Kirazci Committed by Android (Google) Code Review
Browse files

Merge "Rely only on NDK libs if built against the NDK."

parents 8feadde7 478a3808

core/native_test.mk

+6 −2
Original line number Diff line number Diff line
@@ -4,12 +4,16 @@ 
###########################################



LOCAL_CFLAGS += -DGTEST_OS_LINUX_ANDROID -DGTEST_HAS_STD_STRING



LOCAL_C_INCLUDES += external/gtest/include

LOCAL_STATIC_LIBRARIES += libgtest libgtest_main



ifndef LOCAL_SDK_VERSION

LOCAL_C_INCLUDES += bionic \

                    bionic/libstdc++/include \

                    external/gtest/include \

                    external/stlport/stlport

LOCAL_STATIC_LIBRARIES += libgtest libgtest_main

LOCAL_SHARED_LIBRARIES += libstlport

endif



ifndef LOCAL_MODULE_PATH

LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_NATIVE_TESTS)/$(LOCAL_MODULE)