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

Commit 43db1c34 authored by Dan Albert's avatar Dan Albert
Browse files

Revert "Disable the static libcutils tests." 

Also move them to libc++ since stlport is dead.

Bug: 18389856

This reverts commit bb28776d.

Change-Id: Icdf9be3bc5cc40433727ff71a121b145002dda72
parent 3891cfef

libcutils/tests/Android.mk

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