openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

* commit '06279285ae38b58988a9431c89b8689d8e16904e':
  Revert "Move some tests to libc++."
This commit is contained in:
Dan Albert 2014-11-12 05:50:56 +00:00 committed by Android Git Automerger
parent 4e47296686 06279285ae
commit 21d8d89c7c
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libcutils/tests/Android.mk
View File

@ -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

1
libion/tests/Android.mk
View File

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