mirror of
https://github.com/moparisthebest/curl
synced 2024-08-13 17:03:50 -04:00
Copy the license file so it's seen by the Android build system
This commit is contained in:
parent
7871fbad4d
commit
147609ca6e
21
Android.mk
21
Android.mk
@ -2,7 +2,7 @@
|
|||||||
#
|
#
|
||||||
# Place the curl source (including this makefile) into external/curl/ in the
|
# 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'
|
# Android source tree. Then build them with 'make curl' or just 'make libcurl'
|
||||||
# from the Android root. Tested with Android 1.5
|
# from the Android root. Tested with Android 1.5 and 2.1
|
||||||
#
|
#
|
||||||
# Note: you must first create a curl_config.h file by running configure in the
|
# 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
|
# Android environment. The only way I've found to do this is tricky. Perform a
|
||||||
@ -26,12 +26,15 @@
|
|||||||
# PATH="$A/prebuilt/linux-x86/toolchain/arm-eabi-X/bin:$PATH" \
|
# PATH="$A/prebuilt/linux-x86/toolchain/arm-eabi-X/bin:$PATH" \
|
||||||
# ./configure --host=arm-linux CC=arm-eabi-gcc \
|
# ./configure --host=arm-linux CC=arm-eabi-gcc \
|
||||||
# CPPFLAGS="-I $A/system/core/include ..." \
|
# CPPFLAGS="-I $A/system/core/include ..." \
|
||||||
# CFLAGS="-fno-exceptions -Wno-multichar ..." \
|
# CFLAGS="-nostdlib -fno-exceptions -Wno-multichar ..." \
|
||||||
# LIB="$A/prebuilt/linux-x86/toolchain/arm-eabi-X/lib/gcc/arm-eabi/X\
|
# LIB="$A/prebuilt/linux-x86/toolchain/arm-eabi-X/lib/gcc/arm-eabi/X\
|
||||||
# /interwork/libgcc.a ..." \
|
# /interwork/libgcc.a ..." \
|
||||||
#
|
#
|
||||||
|
# Finally, copy the file COPYING to NOTICE so that the curl license gets put
|
||||||
|
# into the right place (see the note about this below).
|
||||||
|
#
|
||||||
# Dan Fandrich
|
# Dan Fandrich
|
||||||
# September 2009
|
# May 2010
|
||||||
|
|
||||||
LOCAL_PATH:= $(call my-dir)
|
LOCAL_PATH:= $(call my-dir)
|
||||||
|
|
||||||
@ -63,6 +66,14 @@ LOCAL_COPY_HEADERS := $(addprefix include/curl/,$(CURL_HEADERS))
|
|||||||
|
|
||||||
LOCAL_MODULE:= libcurl
|
LOCAL_MODULE:= libcurl
|
||||||
|
|
||||||
|
# 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)
|
include $(BUILD_STATIC_LIBRARY)
|
||||||
|
|
||||||
|
|
||||||
@ -79,8 +90,8 @@ LOCAL_SYSTEM_SHARED_LIBRARIES := libc
|
|||||||
|
|
||||||
LOCAL_C_INCLUDES += $(LOCAL_PATH)/include $(LOCAL_PATH)/lib
|
LOCAL_C_INCLUDES += $(LOCAL_PATH)/include $(LOCAL_PATH)/lib
|
||||||
|
|
||||||
# This will also need to include $(CURLX_ONES) in order to correctly build
|
# This will also need to include $(CURLX_ONES) in order to correctly link
|
||||||
# a dynamic library
|
# against a dynamic library
|
||||||
LOCAL_CFLAGS += $(common_CFLAGS)
|
LOCAL_CFLAGS += $(common_CFLAGS)
|
||||||
|
|
||||||
include $(BUILD_EXECUTABLE)
|
include $(BUILD_EXECUTABLE)
|
||||||
|
Loading…
Reference in New Issue
Block a user