pa-fazil
/
android_system_core
mirror of https://github.com/fazilsheik96/android_system_core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

am 29a34a5e: Merge "Disable the static libcutils tests." 

* commit '29a34a5e7c249046a995a140ba30fa10960c7d42':
  Disable the static libcutils tests.
This commit is contained in:
Dan Albert 2014-11-14 21:47:40 +00:00 committed by Android Git Automerger
parent 0f2966a3ca 29a34a5e7c
commit a57aacbaef
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libcutils/tests/Android.mk
View File

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