diff options
Diffstat (limited to 'libcutils')
| -rw-r--r-- | libcutils/Android.mk | 2 | ||||
| -rw-r--r-- | libcutils/tests/Android.mk | 32 |
2 files changed, 16 insertions, 18 deletions
diff --git a/libcutils/Android.mk b/libcutils/Android.mk index 9f32307..0cd560d 100644 --- a/libcutils/Android.mk +++ b/libcutils/Android.mk @@ -22,6 +22,7 @@ commonSources := \ native_handle.c \ config_utils.c \ load_file.c \ + memory.c \ open_memstream.c \ strdup16to8.c \ strdup8to16.c \ @@ -113,7 +114,6 @@ LOCAL_SRC_FILES := $(commonSources) \ ashmem-dev.c \ debugger.c \ klog.c \ - memory.c \ partition_utils.c \ properties.c \ qtaguid.c \ diff --git a/libcutils/tests/Android.mk b/libcutils/tests/Android.mk index 5a54698..d532dfb 100644 --- a/libcutils/tests/Android.mk +++ b/libcutils/tests/Android.mk @@ -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) |