From 7be925aefc0114f5174dff36fa7b9b5ac32305c8 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 6 Feb 2013 23:08:05 +0100 Subject: build: move Android.mk to packages/Android/ --- Android.mk | 112 -------------------------------------------- Makefile.am | 3 +- docs/INSTALL | 2 +- packages/Android/Android.mk | 112 ++++++++++++++++++++++++++++++++++++++++++++ packages/Makefile.am | 4 +- 5 files changed, 116 insertions(+), 117 deletions(-) delete mode 100644 Android.mk create mode 100644 packages/Android/Android.mk diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 2c0064fac..000000000 --- a/Android.mk +++ /dev/null @@ -1,112 +0,0 @@ -# Google Android makefile for curl and libcurl -# -# This file can be used when building curl using the full Android source -# release or the NDK. Most users do not want or need to do this; please -# instead read the Android section in docs/INSTALL for alternate -# methods. -# -# 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. Tested with Android versions 1.5, 2.1-2.3 -# -# Note: you must first create a curl_config.h file by running configure in the -# Android environment. The only way I've found to do this is tricky. Perform a -# normal Android build with libcurl in the source tree, providing the target -# "showcommands" to make. The build will eventually fail (because curl_config.h -# doesn't exist yet), but the compiler commands used to build curl will be -# shown. Now, from the external/curl/ directory, run curl's normal configure -# command with flags that match what Android itself uses. This will mean -# putting the compiler directory into the PATH, putting the -I, -isystem and -# -D options into CPPFLAGS, putting the -W, -m, -f, -O and -nostdlib options -# into CFLAGS, and putting the -Wl, -L and -l options into LIBS, along with the -# path to the files libgcc.a, crtbegin_dynamic.o, and ccrtend_android.o. -# Remember that the paths must be absolute since you will not be running -# configure from the same directory as the Android make. The normal -# cross-compiler options must also be set. Note that the -c, -o, -MD and -# similar flags must not be set. -# -# To see all the LIBS options, you'll need to do the "showcommands" trick on an -# executable that's already buildable and watch what flags Android uses to link -# it (dhcpcd is a good choice to watch). You'll also want to add -L options to -# LIBS that point to the out/.../obj/lib/ and out/.../obj/system/lib/ -# directories so that additional libraries can be found and used by curl. -# -# The end result will be a configure command that looks something like this -# (the environment variable A is set to the Android root path which makes the -# command shorter): -# -# A=`realpath ../..` && \ -# PATH="$A/prebuilt/linux-x86/toolchain/arm-eabi-X/bin:$PATH" \ -# ./configure --host=arm-linux CC=arm-eabi-gcc \ -# CPPFLAGS="-I $A/system/core/include ..." \ -# CFLAGS="-nostdlib -fno-exceptions -Wno-multichar ..." \ -# LIBS="$A/prebuilt/linux-x86/toolchain/arm-eabi-X/lib/gcc/arm-eabi/X\ -# /interwork/libgcc.a ..." -# -# Finally, copy the file COPYING to NOTICE so that the curl license gets put -# into the right place (but see the note about this below). -# -# Dan Fandrich -# November 2011 - -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 -CURL_HEADERS := \ - curlbuild.h \ - curl.h \ - curlrules.h \ - curlver.h \ - easy.h \ - mprintf.h \ - multi.h \ - stdcheaders.h \ - typecheck-gcc.h - -LOCAL_SRC_FILES := $(addprefix lib/,$(CSOURCES)) -LOCAL_C_INCLUDES += $(LOCAL_PATH)/include/ -LOCAL_CFLAGS += $(common_CFLAGS) - -LOCAL_COPY_HEADERS_TO := libcurl/curl -LOCAL_COPY_HEADERS := $(addprefix include/curl/,$(CURL_HEADERS)) - -LOCAL_MODULE:= libcurl -LOCAL_MODULE_TAGS := optional - -# Copy the licence to a place where Android will find it. -# Actually, this doesn't quite work because the build system searches -# for NOTICE files before it gets to this point, so it will only be seen -# on subsequent builds. -ALL_PREBUILT += $(LOCAL_PATH)/NOTICE -$(LOCAL_PATH)/NOTICE: $(LOCAL_PATH)/COPYING | $(ACP) - $(copy-file-to-target) - -include $(BUILD_STATIC_LIBRARY) - - -######################### -# Build the curl binary - -include $(CLEAR_VARS) -include $(LOCAL_PATH)/src/Makefile.inc -LOCAL_SRC_FILES := $(addprefix src/,$(CURL_CFILES)) - -LOCAL_MODULE := curl -LOCAL_MODULE_TAGS := optional -LOCAL_STATIC_LIBRARIES := libcurl -LOCAL_SYSTEM_SHARED_LIBRARIES := libc - -LOCAL_C_INCLUDES += $(LOCAL_PATH)/include $(LOCAL_PATH)/lib - -# This may also need to include $(CURLX_ONES) in order to correctly link -# if libcurl is changed to be built as a dynamic library -LOCAL_CFLAGS += $(common_CFLAGS) - -include $(BUILD_EXECUTABLE) - diff --git a/Makefile.am b/Makefile.am index cbe983ffd..3ea73a480 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,8 +35,7 @@ winbuild/MakefileBuild.vc winbuild/Makefile.vc EXTRA_DIST = CHANGES COPYING maketgz Makefile.dist curl-config.in \ RELEASE-NOTES buildconf libcurl.pc.in vc6curl.dsw MacOSX-Framework \ - Android.mk $(CMAKE_DIST) Makefile.msvc.names $(WINBUILD_DIST) \ - lib/libcurl.vers.in + $(CMAKE_DIST) Makefile.msvc.names $(WINBUILD_DIST) lib/libcurl.vers.in bin_SCRIPTS = curl-config diff --git a/docs/INSTALL b/docs/INSTALL index def3ce81e..c13a66094 100644 --- a/docs/INSTALL +++ b/docs/INSTALL @@ -876,7 +876,7 @@ VxWorks Android ======= Method using the static makefile: - - see the build notes in the Android.mk file. + - see the build notes in the packages/Android/Android.mk file. Method using a configure cross-compile (tested with Android NDK r7c, r8): - prepare the toolchain of the Android NDK for standalone use; this can diff --git a/packages/Android/Android.mk b/packages/Android/Android.mk new file mode 100644 index 000000000..2c0064fac --- /dev/null +++ b/packages/Android/Android.mk @@ -0,0 +1,112 @@ +# Google Android makefile for curl and libcurl +# +# This file can be used when building curl using the full Android source +# release or the NDK. Most users do not want or need to do this; please +# instead read the Android section in docs/INSTALL for alternate +# methods. +# +# 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. Tested with Android versions 1.5, 2.1-2.3 +# +# Note: you must first create a curl_config.h file by running configure in the +# Android environment. The only way I've found to do this is tricky. Perform a +# normal Android build with libcurl in the source tree, providing the target +# "showcommands" to make. The build will eventually fail (because curl_config.h +# doesn't exist yet), but the compiler commands used to build curl will be +# shown. Now, from the external/curl/ directory, run curl's normal configure +# command with flags that match what Android itself uses. This will mean +# putting the compiler directory into the PATH, putting the -I, -isystem and +# -D options into CPPFLAGS, putting the -W, -m, -f, -O and -nostdlib options +# into CFLAGS, and putting the -Wl, -L and -l options into LIBS, along with the +# path to the files libgcc.a, crtbegin_dynamic.o, and ccrtend_android.o. +# Remember that the paths must be absolute since you will not be running +# configure from the same directory as the Android make. The normal +# cross-compiler options must also be set. Note that the -c, -o, -MD and +# similar flags must not be set. +# +# To see all the LIBS options, you'll need to do the "showcommands" trick on an +# executable that's already buildable and watch what flags Android uses to link +# it (dhcpcd is a good choice to watch). You'll also want to add -L options to +# LIBS that point to the out/.../obj/lib/ and out/.../obj/system/lib/ +# directories so that additional libraries can be found and used by curl. +# +# The end result will be a configure command that looks something like this +# (the environment variable A is set to the Android root path which makes the +# command shorter): +# +# A=`realpath ../..` && \ +# PATH="$A/prebuilt/linux-x86/toolchain/arm-eabi-X/bin:$PATH" \ +# ./configure --host=arm-linux CC=arm-eabi-gcc \ +# CPPFLAGS="-I $A/system/core/include ..." \ +# CFLAGS="-nostdlib -fno-exceptions -Wno-multichar ..." \ +# LIBS="$A/prebuilt/linux-x86/toolchain/arm-eabi-X/lib/gcc/arm-eabi/X\ +# /interwork/libgcc.a ..." +# +# Finally, copy the file COPYING to NOTICE so that the curl license gets put +# into the right place (but see the note about this below). +# +# Dan Fandrich +# November 2011 + +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 +CURL_HEADERS := \ + curlbuild.h \ + curl.h \ + curlrules.h \ + curlver.h \ + easy.h \ + mprintf.h \ + multi.h \ + stdcheaders.h \ + typecheck-gcc.h + +LOCAL_SRC_FILES := $(addprefix lib/,$(CSOURCES)) +LOCAL_C_INCLUDES += $(LOCAL_PATH)/include/ +LOCAL_CFLAGS += $(common_CFLAGS) + +LOCAL_COPY_HEADERS_TO := libcurl/curl +LOCAL_COPY_HEADERS := $(addprefix include/curl/,$(CURL_HEADERS)) + +LOCAL_MODULE:= libcurl +LOCAL_MODULE_TAGS := optional + +# Copy the licence to a place where Android will find it. +# Actually, this doesn't quite work because the build system searches +# for NOTICE files before it gets to this point, so it will only be seen +# on subsequent builds. +ALL_PREBUILT += $(LOCAL_PATH)/NOTICE +$(LOCAL_PATH)/NOTICE: $(LOCAL_PATH)/COPYING | $(ACP) + $(copy-file-to-target) + +include $(BUILD_STATIC_LIBRARY) + + +######################### +# Build the curl binary + +include $(CLEAR_VARS) +include $(LOCAL_PATH)/src/Makefile.inc +LOCAL_SRC_FILES := $(addprefix src/,$(CURL_CFILES)) + +LOCAL_MODULE := curl +LOCAL_MODULE_TAGS := optional +LOCAL_STATIC_LIBRARIES := libcurl +LOCAL_SYSTEM_SHARED_LIBRARIES := libc + +LOCAL_C_INCLUDES += $(LOCAL_PATH)/include $(LOCAL_PATH)/lib + +# This may also need to include $(CURLX_ONES) in order to correctly link +# if libcurl is changed to be built as a dynamic library +LOCAL_CFLAGS += $(common_CFLAGS) + +include $(BUILD_EXECUTABLE) + diff --git a/packages/Makefile.am b/packages/Makefile.am index 75c774d70..bef04f3c2 100644 --- a/packages/Makefile.am +++ b/packages/Makefile.am @@ -29,5 +29,5 @@ EXTRA_DIST = README \ Symbian/readme.txt \ TPF/curl.mak \ TPF/maketpf.env_curl \ - TPF/maketpf.env_curllib - + TPF/maketpf.env_curllib \ + Android/Android.mk -- cgit v1.2.3