ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Dan Albert 2014-11-12 05:43:55 +00:00 • committed by Gerrit Code Review
commit 06279285ae
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 \ 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

1
libion/tests/Android.mk
View file

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