diff options
-rw-r--r-- | Android.mk | 2 | ||||
-rw-r--r-- | src/miniacc.h | 2 |
2 files changed, 4 insertions, 0 deletions
@@ -81,6 +81,7 @@ LOCAL_SRC_FILES:= $(common_SRC_FILES) LOCAL_C_INCLUDES:= $(common_C_INCLUDES) LOCAL_MODULE := liblzo-static LOCAL_PRELINK_MODULE:= false +LOCAL_MODULE_TAGS := optional include $(BUILD_STATIC_LIBRARY) # dynamic library @@ -91,5 +92,6 @@ LOCAL_SRC_FILES:= $(common_SRC_FILES) LOCAL_C_INCLUDES:= $(common_C_INCLUDES) LOCAL_MODULE := liblzo LOCAL_PRELINK_MODULE:= false +LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) diff --git a/src/miniacc.h b/src/miniacc.h index 315a20b..6701dbf 100644 --- a/src/miniacc.h +++ b/src/miniacc.h @@ -1902,7 +1902,9 @@ extern "C" { #define HAVE_FCNTL_H 1 #define HAVE_FLOAT_H 1 #define HAVE_LIMITS_H 1 +#ifndef HAVE_MALLOC_H #define HAVE_MALLOC_H 1 +#endif #define HAVE_MEMORY_H 1 #define HAVE_SETJMP_H 1 #define HAVE_SIGNAL_H 1 |