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

Commit c7c75cd4 authored by Dan Albert's avatar Dan Albert Committed by Android Git Automerger
Browse files

am 21d8d89c: am 06279285: Merge "Revert "Move some tests to libc++."" 

* commit '21d8d89c':
  Revert "Move some tests to libc++."
parents ff0079fc 21d8d89c

libcutils/tests/Android.mk

+1 −3
Original line number Diff line number Diff line
@@ -42,10 +42,8 @@ LOCAL_STATIC_LIBRARIES := \ 
    libcutils \

    liblog \

    libutils \

    libc++abi \

    libdl \



LOCAL_CXX_STL := libc++_static

LOCAL_CXX_STL := stlport_static

LOCAL_MULTILIB := both

LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32

LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64

libion/tests/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ LOCAL_MODULE := ion-unit-tests 
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

LOCAL_CFLAGS += -g -Wall -Werror -std=gnu++11 -Wno-missing-field-initializers

LOCAL_SHARED_LIBRARIES += libion

LOCAL_STATIC_LIBRARIES += libgtest_main

LOCAL_C_INCLUDES := $(LOCAL_PATH)/../kernel-headers

LOCAL_SRC_FILES := \

	ion_test_fixture.cpp \