3 files changed, 34 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
new file mode 100755
index 0000000..88cebe7
--- /dev/null
+++ b/Android.mk
@@ -0,0 +1,32 @@
+
+LOCAL_PATH := $(call my-dir)
+
+C_SRC_FILES := \
+    src/google/protobuf-c/protobuf-c-rpc.c              \
+    src/google/protobuf-c/protobuf-c-dispatch.c         \
+    src/google/protobuf-c/protobuf-c-data-buffer.c      \
+    src/google/protobuf-c/protobuf-c.c
+
+# C library
+# =======================================================
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libprotobuf-c
+LOCAL_MODULE_TAGS := debug
+
+LOCAL_SRC_FILES := $(C_SRC_FILES)
+
+LOCAL_C_INCLUDES := \
+    $(LOCAL_PATH)/src
+
+LOCAL_COPY_HEADERS_TO := protobuf-c/include/google/protobuf-c/
+LOCAL_COPY_HEADERS := ./src/google/protobuf-c/protobuf-c.h
+LOCAL_COPY_HEADERS += ./src/google/protobuf-c/protobuf-c-private.h
+
+LOCAL_SHARED_LIBRARIES := \
+    libcutils libutils
+
+LOCAL_CFLAGS := -DGOOGLE_PROTOBUF_NO_RTTI -DHAVE_SYS_POLL_H -DHAVE_ALLOCA_H -DHAVE_UNISTD_H
+
+include $(BUILD_STATIC_LIBRARY)
+
diff --git a/src/google/protobuf-c/protobuf-c-data-buffer.c b/src/google/protobuf-c/protobuf-c-data-buffer.c
index c7ead5d..4549c3b 100644..100755
--- a/src/google/protobuf-c/protobuf-c-data-buffer.c
+++ b/src/google/protobuf-c/protobuf-c-data-buffer.c
@@ -35,7 +35,7 @@
 #include <errno.h>
 #if HAVE_ALLOCA_H
 # include <alloca.h>
-#elif HAVE_MALLOC_H
+#elif defined HAVE_MALLOC_H
 # include <malloc.h>
 #endif
 #include <stdlib.h>
diff --git a/src/google/protobuf-c/protobuf-c-dispatch.c b/src/google/protobuf-c/protobuf-c-dispatch.c
index ff1e0e0..e280d77 100644..100755
--- a/src/google/protobuf-c/protobuf-c-dispatch.c
+++ b/src/google/protobuf-c/protobuf-c-dispatch.c
@@ -51,7 +51,7 @@
 #include <assert.h>
 #if HAVE_ALLOCA_H
 # include <alloca.h>
-#elif HAVE_MALLOC_H
+#elif defined HAVE_MALLOC_H
 # include <malloc.h>
 #endif
 #include <sys/time.h>