diff options
| author | Dan Albert <danalbert@google.com> | 2015-04-01 16:43:47 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2015-04-01 16:45:28 -0700 |
| commit | 43db1c347ba52e0c84c3d00868ed3d4a87e29927 (patch) | |
| tree | 6e9603beacc3edef1b1fe54ab59c108409e93544 /libcutils | |
| parent | 3891cfef5e27da0f33ccab42e9a14cc1e38331ee (diff) | |
| download | system_core-43db1c347ba52e0c84c3d00868ed3d4a87e29927.zip system_core-43db1c347ba52e0c84c3d00868ed3d4a87e29927.tar.gz system_core-43db1c347ba52e0c84c3d00868ed3d4a87e29927.tar.bz2 | |
Revert "Disable the static libcutils tests."
Also move them to libc++ since stlport is dead.
Bug: 18389856
This reverts commit bb28776db0f5a107ef2b90ff1322f4c06b6cc7de.
Change-Id: Icdf9be3bc5cc40433727ff71a121b145002dda72
Diffstat (limited to 'libcutils')
| -rw-r--r-- | libcutils/tests/Android.mk | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/libcutils/tests/Android.mk b/libcutils/tests/Android.mk index 5a54698..d532dfb 100644 --- a/libcutils/tests/Android.mk +++ b/libcutils/tests/Android.mk @@ -32,21 +32,19 @@ LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 include $(BUILD_NATIVE_TEST) -# The static libcutils tests cannot be built when using libc++ because there are -# multiple symbol definition errors between libc++ and libgcc. b/18389856 -#include $(CLEAR_VARS) -#LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk -#LOCAL_MODULE := libcutils_test_static -#LOCAL_FORCE_STATIC_EXECUTABLE := true -#LOCAL_SRC_FILES := $(test_src_files) -#LOCAL_STATIC_LIBRARIES := \ -# libc \ -# libcutils \ -# liblog \ -# libutils \ +include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk +LOCAL_MODULE := libcutils_test_static +LOCAL_FORCE_STATIC_EXECUTABLE := true +LOCAL_SRC_FILES := $(test_src_files) +LOCAL_STATIC_LIBRARIES := \ + libc \ + libcutils \ + liblog \ + libutils \ -#LOCAL_CXX_STL := stlport_static -#LOCAL_MULTILIB := both -#LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 -#LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 -#include $(BUILD_NATIVE_TEST) +LOCAL_CXX_STL := libc++_static +LOCAL_MULTILIB := both +LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 +LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 +include $(BUILD_NATIVE_TEST) |