Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb28776d authored by Dan Albert's avatar Dan Albert
Browse files

Disable the static libcutils tests. 

The static libcutils tests cannot be built when using libc++ because
there are multiple symbol definition errors between libc++ and libgcc.

Bug: 18389856
Change-Id: I6f41c561f97b3a37477f844e9abf6551524a0fa3
parent 6ef68b55

libcutils/tests/Android.mk

+17 −15
Original line number Diff line number Diff line
@@ -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)