Skip to content
Snippets Groups Projects
Commit 06279285 authored by Dan Albert's avatar Dan Albert Committed by Gerrit Code Review
Browse files

Merge "Revert "Move some tests to libc++.""

parents 5c7e2e60 1d3b492b
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
libcutils/tests/Android.mk
+ 1
− 3
View file @ 06279285
...@@ -42,10 +42,8 @@ LOCAL_STATIC_LIBRARIES := \ ...@@ -42,10 +42,8 @@ LOCAL_STATIC_LIBRARIES := \
libcutils \ libcutils \
liblog \ liblog \
libutils \ libutils \
libc++abi \
libdl \
LOCAL_CXX_STL := libc++_static LOCAL_CXX_STL := stlport_static
LOCAL_MULTILIB := both LOCAL_MULTILIB := both
LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
......
libion/tests/Android.mk
+ 1
− 0
View file @ 06279285
...@@ -21,6 +21,7 @@ LOCAL_MODULE := ion-unit-tests ...@@ -21,6 +21,7 @@ LOCAL_MODULE := ion-unit-tests
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_CFLAGS += -g -Wall -Werror -std=gnu++11 -Wno-missing-field-initializers LOCAL_CFLAGS += -g -Wall -Werror -std=gnu++11 -Wno-missing-field-initializers
LOCAL_SHARED_LIBRARIES += libion LOCAL_SHARED_LIBRARIES += libion
LOCAL_STATIC_LIBRARIES += libgtest_main
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../kernel-headers LOCAL_C_INCLUDES := $(LOCAL_PATH)/../kernel-headers
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
ion_test_fixture.cpp \ ion_test_fixture.cpp \
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment