From 469462d4dec60e64d0351989d40423a940209f02 Mon Sep 17 00:00:00 2001 From: bossiel Date: Thu, 20 May 2010 15:09:33 +0000 Subject: [PATCH] Update droid makefiles. --- trunk/android-projects/root.mk | 39 ++++++++++++++++------------- trunk/bindings/java/droid-makefile | 4 +-- trunk/tinyDEMO/core-micromethod.sn | 2 +- trunk/tinyDEMO/droid-makefile | 2 +- trunk/tinyHTTP/droid-makefile | 4 +-- trunk/tinyHTTP/test/droid-makefile | 2 +- trunk/tinyIPSec/droid-makefile | 4 +-- trunk/tinyIPSec/test/droid-makefile | 2 +- trunk/tinyMEDIA/droid-makefile | 4 +-- trunk/tinyMEDIA/test/droid-makefile | 2 +- trunk/tinyNET/droid-makefile | 4 +-- trunk/tinyNET/test/droid-makefile | 2 +- trunk/tinySAK/droid-makefile | 4 +-- trunk/tinySAK/test/droid-makefile | 2 +- trunk/tinySDP/droid-makefile | 4 +-- trunk/tinySDP/test/droid-makefile | 2 +- trunk/tinySIP/droid-makefile | 4 +-- trunk/tinySIP/test/droid-makefile | 2 +- trunk/tinySMS/droid-makefile | 4 +-- trunk/tinySMS/test/droid-makefile | 2 +- trunk/tinyXCAP/droid-makefile | 4 +-- trunk/tinyXCAP/test/droid-makefile | 2 +- 22 files changed, 52 insertions(+), 49 deletions(-) diff --git a/trunk/android-projects/root.mk b/trunk/android-projects/root.mk index 8a4cd332..7399e66f 100644 --- a/trunk/android-projects/root.mk +++ b/trunk/android-projects/root.mk @@ -2,9 +2,9 @@ ## Root configuration file shared by all android projects. ###### -export ANDROID_NDK_ROOT=/cygdrive/c/android-ndk-r3 +export ANDROID_NDK_ROOT=/cygdrive/c/android-ndk export ANDROID_SDK_ROOT=/cygdrive/c/android-sdk -export ANDROID_PLATFORM=$(ANDROID_NDK_ROOT)/build/platforms/android-5 +export ANDROID_PLATFORM=$(ANDROID_NDK_ROOT)/build/platforms/android-4 # Output directory export OUTPUT_DIR=$(shell pwd)/output @@ -19,42 +19,45 @@ export AR=arm-eabi-ar export CC=arm-eabi-gcc export CPP=arm-eabi-g++ -export CFLAGS+=$(DEBUG_FLAGS) -I$(ANDROID_PLATFORM)/arch-arm/usr/include \ +export CFLAGS_COMMON=$(CFLAGS) $(DEBUG_FLAGS) -I$(ANDROID_PLATFORM)/arch-arm/usr/include \ -march=armv5te \ -mtune=xscale \ -msoft-float \ +-D__ARM_ARCH_5__ \ +-D__ARM_ARCH_5T__ \ +-D__ARM_ARCH_5E__ \ +-D__ARM_ARCH_5TE__ \ +-MMD \ +-MP \ +-DANDROID + +export CFLAGS_LIB= $(CFLAGS_COMMON) \ -fpic \ -mthumb-interwork \ -ffunction-sections \ -funwind-tables \ -fstack-protector \ -fno-short-enums \ --D__ARM_ARCH_5__ \ --D__ARM_ARCH_5T__ \ --D__ARM_ARCH_5E__ \ --D__ARM_ARCH_5TE__ \ -mthumb \ -Os \ -fomit-frame-pointer \ -fno-strict-aliasing \ --finline-limit=64 \ --DANDROID \ --MMD \ --MP +-finline-limit=64 -export LDFLAGS_COMMON=-Wl,-rpath=/system/lib,-rpath-link=$(ANDROID_PLATFORM)/arch-arm/usr/lib,-rpath-link=$(OUTPUT_DIR),-dynamic-linker=/system/bin/linker -L$(ANDROID_PLATFORM)/arch-arm/usr/lib + +export LDFLAGS_COMMON=$(LDFLAGS) -Wl,-rpath=/system/lib,-rpath-link=$(ANDROID_PLATFORM)/arch-arm/usr/lib,-rpath-link=$(OUTPUT_DIR),-dynamic-linker=/system/bin/linker -L$(ANDROID_PLATFORM)/arch-arm/usr/lib export LDFLAGS_COMMON+=-nostdlib -lc -L$(OUTPUT_DIR) ifeq ($(BT), static) export EXT=a - export LDFLAGS= + export LDFLAGS_LIB= - export CFLAGS+=-static + export CFLAGS_LIB+=-static else export EXT=so - export LDFLAGS=$(LDFLAGS_COMMON) - export LDFLAGS+=-Wl,--no-undefined - export LDFLAGS+=-Wl,--no-whole-archive - export LDFLAGS+=-Wl,-soname,lib$(PROJECT).$(EXT),-Bsymbolic,-shared,--whole-archive + export LDFLAGS_LIB=$(LDFLAGS_COMMON) + export LDFLAGS_LIB+=-Wl,--no-undefined + export LDFLAGS_LIB+=-Wl,--no-whole-archive + export LDFLAGS_LIB+=-Wl,-soname,lib$(PROJECT).$(EXT),-Bsymbolic,-shared,--whole-archive endif diff --git a/trunk/bindings/java/droid-makefile b/trunk/bindings/java/droid-makefile index 17c03632..48ea3d29 100644 --- a/trunk/bindings/java/droid-makefile +++ b/trunk/bindings/java/droid-makefile @@ -1,7 +1,7 @@ APP := lib$(PROJECT).$(EXT) -CFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -I../_common -I../. -I../../tinySAK/src -I../../tinyNET/src -I../../tinyHTTP/include -I../../tinySIP/include -LDFLAGS := $(LDFLAGS) -lstdc++ -ltinySAK -ltinyHTTP -ltinyIPSec -ltinyNET -ltinySIP +CFLAGS := $(CFLAGS_LIB) -fno-rtti -fno-exceptions -I../_common -I../. -I../../tinySAK/src -I../../tinyNET/src -I../../tinyHTTP/include -I../../tinySIP/include +LDFLAGS := $(LDFLAGS_LIB) -lstdc++ -ltinySAK -ltinyHTTP -ltinyIPSec -ltinyNET -ltinySIP diff --git a/trunk/tinyDEMO/core-micromethod.sn b/trunk/tinyDEMO/core-micromethod.sn index 89591d94..d617fe69 100644 --- a/trunk/tinyDEMO/core-micromethod.sn +++ b/trunk/tinyDEMO/core-micromethod.sn @@ -7,7 +7,7 @@ %%proxy_ip 192.168.16.104 # IP address or FQDN %%proxy_port 5060 %%proxy_trans udp # udp, tcp, tls or sctp -%%expires 100 # expires used by all dialogs +%%expires 30 # expires used by all dialogs %%sleep-sec 1.0 # number of seconds to wait before sending next sip message %%reg-sid diff --git a/trunk/tinyDEMO/droid-makefile b/trunk/tinyDEMO/droid-makefile index 492aefff..5fa32708 100644 --- a/trunk/tinyDEMO/droid-makefile +++ b/trunk/tinyDEMO/droid-makefile @@ -1,6 +1,6 @@ APP := demo -CFLAGS := $(CFLAGS) -I../tinySAK/src -I../tinyNET/src -I../tinySMS/include -I../tinyHTTP/include -I../tinySIP/include +CFLAGS := $(CFLAGS_COMMON) -I../tinySAK/src -I../tinyNET/src -I../tinySMS/include -I../tinyHTTP/include -I../tinySIP/include LDFLAGS := $(LDFLAGS_COMMON) -Wl,-Bsymbolic,--whole-archive -Wl,--entry=main -lm -ltinySAK -ltinyNET -ltinyHTTP -ltinyIPSec -ltinySMS -ltinySIP all: $(APP) diff --git a/trunk/tinyHTTP/droid-makefile b/trunk/tinyHTTP/droid-makefile index 7cf1b183..6d52115a 100644 --- a/trunk/tinyHTTP/droid-makefile +++ b/trunk/tinyHTTP/droid-makefile @@ -1,7 +1,7 @@ APP := lib$(PROJECT).$(EXT) -CFLAGS := $(CFLAGS) -I../tinySAK/src -I../tinyNET/src -I./include -LDFLAGS := $(LDFLAGS) -ltinySAK -ltinyNET +CFLAGS := $(CFLAGS_LIB) -I../tinySAK/src -I../tinyNET/src -I./include +LDFLAGS := $(LDFLAGS_LIB) -ltinySAK -ltinyNET all: $(APP) diff --git a/trunk/tinyHTTP/test/droid-makefile b/trunk/tinyHTTP/test/droid-makefile index 0b559696..c4739925 100644 --- a/trunk/tinyHTTP/test/droid-makefile +++ b/trunk/tinyHTTP/test/droid-makefile @@ -1,6 +1,6 @@ APP := test -CFLAGS := $(CFLAGS) -I../include -I../../tinySAK/src -I../../tinyNET/src +CFLAGS := $(CFLAGS_COMMON) -I../include -I../../tinySAK/src -I../../tinyNET/src LDFLAGS := $(LDFLAGS_COMMON) -Wl,-Bsymbolic,--whole-archive -l$(PROJECT) -ltinySAK -ltinyNET -Wl,--entry=main all: $(APP) diff --git a/trunk/tinyIPSec/droid-makefile b/trunk/tinyIPSec/droid-makefile index 75eb806b..d2b1acf0 100644 --- a/trunk/tinyIPSec/droid-makefile +++ b/trunk/tinyIPSec/droid-makefile @@ -1,7 +1,7 @@ APP := lib$(PROJECT).$(EXT) -CFLAGS := $(CFLAGS) -I../tinySAK/src -I./src -LDFLAGS := -ltinySAK $(LDFLAGS) +CFLAGS := $(CFLAGS_LIB) -I../tinySAK/src -I./src +LDFLAGS := -ltinySAK $(LDFLAGS_LIB) all: $(APP) diff --git a/trunk/tinyIPSec/test/droid-makefile b/trunk/tinyIPSec/test/droid-makefile index a86f36ad..d3456be2 100644 --- a/trunk/tinyIPSec/test/droid-makefile +++ b/trunk/tinyIPSec/test/droid-makefile @@ -1,6 +1,6 @@ APP := test -CFLAGS := $(CFLAGS) -I../src -I../../tinySAK/src +CFLAGS := $(CFLAGS_COMMON) -I../src -I../../tinySAK/src LDFLAGS := $(LDFLAGS_COMMON) -Wl,-Bsymbolic,--whole-archive -l$(PROJECT) -ltinySAK -Wl,--entry=main all: $(APP) diff --git a/trunk/tinyMEDIA/droid-makefile b/trunk/tinyMEDIA/droid-makefile index 51539f12..67eca341 100644 --- a/trunk/tinyMEDIA/droid-makefile +++ b/trunk/tinyMEDIA/droid-makefile @@ -1,7 +1,7 @@ APP := lib$(PROJECT).$(EXT) -CFLAGS := $(CFLAGS) -I../tinySAK/src -I../tinyNET/src -I../tinySDP/include -I./include -LDFLAGS := $(LDFLAGS) -ltinySAK -ltinyNET -ltinySDP +CFLAGS := $(CFLAGS_LIB) -I../tinySAK/src -I../tinyNET/src -I../tinySDP/include -I./include +LDFLAGS := $(LDFLAGS_LIB) -ltinySAK -ltinyNET -ltinySDP all: $(APP) diff --git a/trunk/tinyMEDIA/test/droid-makefile b/trunk/tinyMEDIA/test/droid-makefile index 229dfa65..192affd4 100644 --- a/trunk/tinyMEDIA/test/droid-makefile +++ b/trunk/tinyMEDIA/test/droid-makefile @@ -1,6 +1,6 @@ APP := test -CFLAGS := $(CFLAGS) -I../include -I../../tinySAK/src -I../../tinyNET/src -I../../tinySDP/include +CFLAGS := $(CFLAGS_COMMON) -I../include -I../../tinySAK/src -I../../tinyNET/src -I../../tinySDP/include LDFLAGS := $(LDFLAGS_COMMON) -Wl,-Bsymbolic,--whole-archive -l$(PROJECT) -ltinySAK -ltinyNET -ltinySDP -Wl,--entry=main all: $(APP) diff --git a/trunk/tinyNET/droid-makefile b/trunk/tinyNET/droid-makefile index 7e182477..d615dcfc 100644 --- a/trunk/tinyNET/droid-makefile +++ b/trunk/tinyNET/droid-makefile @@ -1,7 +1,7 @@ APP := lib$(PROJECT).$(EXT) -CFLAGS := $(CFLAGS) -I../tinySAK/src -I./src -LDFLAGS := $(LDFLAGS) -ltinySAK +CFLAGS := $(CFLAGS_LIB) -I../tinySAK/src -I./src +LDFLAGS := $(LDFLAGS_LIB) -ltinySAK all: $(APP) diff --git a/trunk/tinyNET/test/droid-makefile b/trunk/tinyNET/test/droid-makefile index e4a506fb..26651a23 100644 --- a/trunk/tinyNET/test/droid-makefile +++ b/trunk/tinyNET/test/droid-makefile @@ -1,6 +1,6 @@ APP := test -CFLAGS := $(CFLAGS) -I../src -I../../tinySAK/src +CFLAGS := $(CFLAGS_COMMON) -I../src -I../../tinySAK/src LDFLAGS := $(LDFLAGS_COMMON) -Wl,-Bsymbolic,--whole-archive -l$(PROJECT) -ltinySAK -Wl,--entry=main all: $(APP) diff --git a/trunk/tinySAK/droid-makefile b/trunk/tinySAK/droid-makefile index ba0f4965..0b3fdd05 100644 --- a/trunk/tinySAK/droid-makefile +++ b/trunk/tinySAK/droid-makefile @@ -1,7 +1,7 @@ APP := lib$(PROJECT).$(EXT) -CFLAGS := $(CFLAGS) -LDFLAGS := $(LDFLAGS) +CFLAGS := $(CFLAGS_LIB) +LDFLAGS := $(LDFLAGS_LIB) all: $(APP) diff --git a/trunk/tinySAK/test/droid-makefile b/trunk/tinySAK/test/droid-makefile index f1a5af95..2905a669 100644 --- a/trunk/tinySAK/test/droid-makefile +++ b/trunk/tinySAK/test/droid-makefile @@ -1,6 +1,6 @@ APP := test -CFLAGS := $(CFLAGS) -I../src +CFLAGS := $(CFLAGS_COMMON) -I../src LDFLAGS := $(LDFLAGS_COMMON) -Wl,-Bsymbolic,--whole-archive -l$(PROJECT) -Wl,--entry=main all: $(APP) diff --git a/trunk/tinySDP/droid-makefile b/trunk/tinySDP/droid-makefile index 4a546601..c3144252 100644 --- a/trunk/tinySDP/droid-makefile +++ b/trunk/tinySDP/droid-makefile @@ -1,7 +1,7 @@ APP := lib$(PROJECT).$(EXT) -CFLAGS := $(CFLAGS) -I../tinySAK/src -I./include -LDFLAGS := $(LDFLAGS) -ltinySAK +CFLAGS := $(CFLAGS_LIB) -I../tinySAK/src -I./include +LDFLAGS := $(LDFLAGS_LIB) -ltinySAK all: $(APP) diff --git a/trunk/tinySDP/test/droid-makefile b/trunk/tinySDP/test/droid-makefile index 4dc3bfe4..76e5f0c4 100644 --- a/trunk/tinySDP/test/droid-makefile +++ b/trunk/tinySDP/test/droid-makefile @@ -1,6 +1,6 @@ APP := test -CFLAGS := $(CFLAGS) -I../include -I../../tinySAK/src +CFLAGS := $(CFLAGS_COMMON) -I../include -I../../tinySAK/src LDFLAGS := $(LDFLAGS_COMMON) -Wl,-Bsymbolic,--whole-archive -l$(PROJECT) -ltinySAK -Wl,--entry=main all: $(APP) diff --git a/trunk/tinySIP/droid-makefile b/trunk/tinySIP/droid-makefile index 5ee0f107..3e8cfb4c 100644 --- a/trunk/tinySIP/droid-makefile +++ b/trunk/tinySIP/droid-makefile @@ -1,7 +1,7 @@ APP := lib$(PROJECT).$(EXT) -CFLAGS := $(CFLAGS) -I../tinySAK/src -I../tinyNET/src -I../tinyHTTP/include -I../tinyIPSec/src -I../tinySDP/include -I../tinyMEDIA/include -I./include -LDFLAGS := $(LDFLAGS) -ltinySAK -ltinyNET -ltinyHTTP -ltinyIPSec -ltinySDP -ltinyMEDIA +CFLAGS := $(CFLAGS_LIB) -I../tinySAK/src -I../tinyNET/src -I../tinyHTTP/include -I../tinyIPSec/src -I../tinySDP/include -I../tinyMEDIA/include -I./include +LDFLAGS := $(LDFLAGS_LIB) -ltinySAK -ltinyNET -ltinyHTTP -ltinyIPSec -ltinySDP -ltinyMEDIA all: $(APP) diff --git a/trunk/tinySIP/test/droid-makefile b/trunk/tinySIP/test/droid-makefile index 52011fd8..c2dbc5c0 100644 --- a/trunk/tinySIP/test/droid-makefile +++ b/trunk/tinySIP/test/droid-makefile @@ -1,6 +1,6 @@ APP := test -CFLAGS := $(CFLAGS) -I../include -I../../tinySAK/src -I../../tinyNET/src -I../../tinyHTTP/include +CFLAGS := $(CFLAGS_COMMON) -I../include -I../../tinySAK/src -I../../tinyNET/src -I../../tinyHTTP/include LDFLAGS := $(LDFLAGS_COMMON) -Wl,-Bsymbolic,--whole-archive -l$(PROJECT) -ltinySAK -ltinyNET -Wl,--entry=main all: $(APP) diff --git a/trunk/tinySMS/droid-makefile b/trunk/tinySMS/droid-makefile index e7d297c6..e01ec688 100644 --- a/trunk/tinySMS/droid-makefile +++ b/trunk/tinySMS/droid-makefile @@ -1,7 +1,7 @@ APP := lib$(PROJECT).$(EXT) -CFLAGS := $(CFLAGS) -I../tinySAK/src -I./include -LDFLAGS := $(LDFLAGS) -ltinySAK +CFLAGS := $(CFLAGS_LIB) -I../tinySAK/src -I./include +LDFLAGS := $(LDFLAGS_LIB) -ltinySAK all: $(APP) diff --git a/trunk/tinySMS/test/droid-makefile b/trunk/tinySMS/test/droid-makefile index 4dc3bfe4..76e5f0c4 100644 --- a/trunk/tinySMS/test/droid-makefile +++ b/trunk/tinySMS/test/droid-makefile @@ -1,6 +1,6 @@ APP := test -CFLAGS := $(CFLAGS) -I../include -I../../tinySAK/src +CFLAGS := $(CFLAGS_COMMON) -I../include -I../../tinySAK/src LDFLAGS := $(LDFLAGS_COMMON) -Wl,-Bsymbolic,--whole-archive -l$(PROJECT) -ltinySAK -Wl,--entry=main all: $(APP) diff --git a/trunk/tinyXCAP/droid-makefile b/trunk/tinyXCAP/droid-makefile index 1026f8f4..ddba8996 100644 --- a/trunk/tinyXCAP/droid-makefile +++ b/trunk/tinyXCAP/droid-makefile @@ -1,7 +1,7 @@ APP := lib$(PROJECT).$(EXT) -CFLAGS := $(CFLAGS) -I../tinySAK/src -I../tinyNET/src -I../tinyHTTP/include -I./include -LDFLAGS := $(LDFLAGS) -ltinySAK -ltinyNET -ltinyHTTP +CFLAGS := $(CFLAGS_LIB) -I../tinySAK/src -I../tinyNET/src -I../tinyHTTP/include -I./include +LDFLAGS := $(LDFLAGS_LIB) -ltinySAK -ltinyNET -ltinyHTTP all: $(APP) diff --git a/trunk/tinyXCAP/test/droid-makefile b/trunk/tinyXCAP/test/droid-makefile index 7477fb91..8857f6dc 100644 --- a/trunk/tinyXCAP/test/droid-makefile +++ b/trunk/tinyXCAP/test/droid-makefile @@ -1,6 +1,6 @@ APP := test -CFLAGS := $(CFLAGS) -I../include -I../../tinySAK/src -I../../tinyNET/src -I../../tinyHTTP/include +CFLAGS := $(CFLAGS_COMMON) -I../include -I../../tinySAK/src -I../../tinyNET/src -I../../tinyHTTP/include LDFLAGS := $(LDFLAGS_COMMON) -Wl,-Bsymbolic,--whole-archive -l$(PROJECT) -ltinySAK -ltinyNET -ltinyHTTP -Wl,--entry=main all: $(APP)