Created a basic Android make file for curl and libcurl. A config.h

is also needed before curl can be built in Android, but it's not clear
what the best way is to provide one.

diff --git a/Android.mk b/Android.mk
new file mode 100644 (file)
index 0000000..7ed3b09
--- /dev/null
+++ b/Android.mk
@@ -0,0 +1,50 @@
+# Google Android makefile for curl and libcurl
+# Place the curl source (including this makefile) into external/curl/ in the
+# Android source tree.  Then build them with 'make curl' or just 'make libcurl'
+# from the Android root.
+#
+# Note: you must first create a config.h file by running configure in the
+# Android environment. I haven't found an easy way to do this yet. If there is
+# no easy way, a static config-android.h may need to be created and checked in
+# to the libcurl source tree.
+#
+# Dan Fandrich
+# June 2009
+
+LOCAL_PATH:= $(call my-dir)
+
+common_CFLAGS := -Wpointer-arith -Wwrite-strings -Wunused -Winline -Wnested-externs -Wmissing-declarations -Wmissing-prototypes -Wno-long-long -Wfloat-equal -Wno-multichar -Wsign-compare -Wno-format-nonliteral -Wendif-labels -Wstrict-prototypes -Wdeclaration-after-statement -Wno-system-headers -DHAVE_CONFIG_H
+
+#########################
+# Build the libcurl library
+
+include $(CLEAR_VARS)
+include $(LOCAL_PATH)/lib/Makefile.inc
+LOCAL_SRC_FILES := $(addprefix lib/,$(CSOURCES))
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/include/
+LOCAL_CFLAGS += $(common_CFLAGS)
+
+LOCAL_MODULE:= libcurl
+
+include $(BUILD_STATIC_LIBRARY)
+
+
+#########################
+# Build the curl binary
+
+include $(CLEAR_VARS)
+include $(LOCAL_PATH)/src/Makefile.inc
+LOCAL_SRC_FILES := $(addprefix src/,$(CURL_SOURCES))
+
+LOCAL_MODULE := curl
+LOCAL_STATIC_LIBRARIES := libcurl
+LOCAL_SYSTEM_SHARED_LIBRARIES := libc
+
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/include $(LOCAL_PATH)/lib
+
+# This will also need to include $(CURLX_ONES) in order to correctly build
+# a dynamic library
+LOCAL_CFLAGS += $(common_CFLAGS)
+
+include $(BUILD_EXECUTABLE)
+

diff --git a/CHANGES b/CHANGES
index 1b63881892a2fca7f6234618b50cb1cde8f24a9a..461049a1f83d58f19a18a845bf1d4278b7f2d128 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,13 @@
 
                                   Changelog
 
+Daniel Fandrich (2 June 2009)
+- Checked in a Google Android make file. To use it, you must first
+  create a config.h file by running configure in the Android environment,
+  which doesn't seem to be easy to do. If no easy way can be found, a
+  static config-android.h may need to be created and checked in to the
+  libcurl source tree.
+
 Daniel Stenberg (1 June 2009)
 - Claes Jakobsson fixed the configure script to better find and use NSS
   without pkg-config.