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

am 7ab2c78e: Merge "Revert "Disable the static libcutils tests.""

Browse source 
* commit '7ab2c78ee9a7df21d149b6c5228f9d0fccb066e0':
  Revert "Disable the static libcutils tests."
This commit is contained in:
Dan Albert 2015-04-02 00:59:19 +00:00 • committed by Android Git Automerger
commit a7be34404c
1 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
libcutils/tests/Android.mk
View file

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