diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-14 21:38:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-14 21:38:07 +0000 |
| commit | 29a34a5e7c249046a995a140ba30fa10960c7d42 (patch) | |
| tree | 2553987e2774d0bdcf84880e94ea311937574f62 | |
| parent | a46bf7eb686661bc8ace6c838e1e3004c993fb36 (diff) | |
| parent | bb28776db0f5a107ef2b90ff1322f4c06b6cc7de (diff) | |
| download | system_core-29a34a5e7c249046a995a140ba30fa10960c7d42.zip system_core-29a34a5e7c249046a995a140ba30fa10960c7d42.tar.gz system_core-29a34a5e7c249046a995a140ba30fa10960c7d42.tar.bz2 | |
Merge "Disable the static libcutils tests."
| -rw-r--r-- | libcutils/tests/Android.mk | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/libcutils/tests/Android.mk b/libcutils/tests/Android.mk index 76db5b1..5a54698 100644 --- a/libcutils/tests/Android.mk +++ b/libcutils/tests/Android.mk @@ -32,19 +32,21 @@ LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 include $(BUILD_NATIVE_TEST) -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 \ +# 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 \ -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 := stlport_static +#LOCAL_MULTILIB := both +#LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 +#LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 +#include $(BUILD_NATIVE_TEST) |