From 2e0b478a01cbd5df831e9d963a4e133194fcce12 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Thu, 12 Jan 2012 19:14:11 +0100 Subject: [PATCH] Android 4 requires LOCAL_MODULE_TAGS to be set for all modules. Because all packages are now marked as optional executables that are to be installed on the final system have to be added to PRODUCT_PACKAGES in build/target/product/core.mk. Dependencies (such as libraries) are installed automatically. --- Android.mk.in | 12 +++++++++--- src/charon/Android.mk | 2 ++ src/ipsec/Android.mk | 2 ++ src/libcharon/Android.mk | 2 ++ src/libfreeswan/Android.mk | 2 ++ src/libhydra/Android.mk | 2 ++ src/libstrongswan/Android.mk | 2 ++ src/libtnccs/Android.mk | 2 ++ src/libtncif/Android.mk | 2 ++ src/pluto/Android.mk | 2 ++ src/starter/Android.mk | 2 ++ src/stroke/Android.mk | 2 ++ src/whack/Android.mk | 2 ++ 13 files changed, 33 insertions(+), 3 deletions(-) diff --git a/Android.mk.in b/Android.mk.in index c110bc673..e1f061350 100644 --- a/Android.mk.in +++ b/Android.mk.in @@ -1,10 +1,16 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -# whether starter is built. allows to control the daemons from the command line -# strongswan_BUILD_STARTER := true +# the executables that should be installed on the final system have to be added +# to PRODUCT_PACKAGES in +# build/target/product/core.mk +# possible executables are +# starter - allows to control and configure the daemons from the command line +# charon - the IKEv2 daemon +# pluto - the IKEv1 daemon -# whether pluto (IKEv1 daemon) is built. charon (IKEv2) is always enabled +# if you enable starter and/or pluto (see above) uncomment the proper lines here +# strongswan_BUILD_STARTER := true # strongswan_BUILD_PLUTO := true # this is the list of plugins that are built into libstrongswan and charon diff --git a/src/charon/Android.mk b/src/charon/Android.mk index 491d7f946..eb7eca9dd 100644 --- a/src/charon/Android.mk +++ b/src/charon/Android.mk @@ -17,6 +17,8 @@ LOCAL_CFLAGS := $(strongswan_CFLAGS) LOCAL_MODULE := charon +LOCAL_MODULE_TAGS := optional + LOCAL_ARM_MODE := arm LOCAL_PRELINK_MODULE := false diff --git a/src/ipsec/Android.mk b/src/ipsec/Android.mk index b6a7c714d..d134f7fd2 100644 --- a/src/ipsec/Android.mk +++ b/src/ipsec/Android.mk @@ -5,6 +5,8 @@ include $(CLEAR_VARS) LOCAL_MODULE := ipsec +LOCAL_MODULE_TAGS := optional + LOCAL_MODULE_CLASS := EXECUTABLES GEN := $(local-intermediates-dir)/ipsec diff --git a/src/libcharon/Android.mk b/src/libcharon/Android.mk index 1a46787a2..f98d36a61 100644 --- a/src/libcharon/Android.mk +++ b/src/libcharon/Android.mk @@ -165,6 +165,8 @@ LOCAL_CFLAGS := $(strongswan_CFLAGS) \ LOCAL_MODULE := libcharon +LOCAL_MODULE_TAGS := optional + LOCAL_ARM_MODE := arm LOCAL_PRELINK_MODULE := false diff --git a/src/libfreeswan/Android.mk b/src/libfreeswan/Android.mk index e9805f0a3..a834d4846 100644 --- a/src/libfreeswan/Android.mk +++ b/src/libfreeswan/Android.mk @@ -26,6 +26,8 @@ LOCAL_CFLAGS := $(strongswan_CFLAGS) LOCAL_MODULE := libfreeswan +LOCAL_MODULE_TAGS := optional + LOCAL_ARM_MODE := arm LOCAL_PRELINK_MODULE := false diff --git a/src/libhydra/Android.mk b/src/libhydra/Android.mk index ccc527f94..075f8dbcb 100644 --- a/src/libhydra/Android.mk +++ b/src/libhydra/Android.mk @@ -32,6 +32,8 @@ LOCAL_CFLAGS := $(strongswan_CFLAGS) LOCAL_MODULE := libhydra +LOCAL_MODULE_TAGS := optional + LOCAL_ARM_MODE := arm LOCAL_PRELINK_MODULE := false diff --git a/src/libstrongswan/Android.mk b/src/libstrongswan/Android.mk index b6897c4c3..d33bee6c7 100644 --- a/src/libstrongswan/Android.mk +++ b/src/libstrongswan/Android.mk @@ -128,6 +128,8 @@ LOCAL_CFLAGS := $(strongswan_CFLAGS) \ LOCAL_MODULE := libstrongswan +LOCAL_MODULE_TAGS := optional + LOCAL_ARM_MODE := arm LOCAL_PRELINK_MODULE := false diff --git a/src/libtnccs/Android.mk b/src/libtnccs/Android.mk index 0055fce34..a4bbc13f5 100644 --- a/src/libtnccs/Android.mk +++ b/src/libtnccs/Android.mk @@ -21,6 +21,8 @@ LOCAL_CFLAGS := $(strongswan_CFLAGS) LOCAL_MODULE := libtnccs +LOCAL_MODULE_TAGS := optional + LOCAL_ARM_MODE := arm LOCAL_PRELINK_MODULE := false diff --git a/src/libtncif/Android.mk b/src/libtncif/Android.mk index 91cfa8354..ef406dd59 100644 --- a/src/libtncif/Android.mk +++ b/src/libtncif/Android.mk @@ -16,6 +16,8 @@ LOCAL_CFLAGS := $(strongswan_CFLAGS) LOCAL_MODULE := libtncif +LOCAL_MODULE_TAGS := optional + LOCAL_ARM_MODE := arm LOCAL_PRELINK_MODULE := false diff --git a/src/pluto/Android.mk b/src/pluto/Android.mk index 4c4bdca92..618f79c42 100644 --- a/src/pluto/Android.mk +++ b/src/pluto/Android.mk @@ -69,6 +69,8 @@ LOCAL_CFLAGS := $(strongswan_CFLAGS) \ LOCAL_MODULE := pluto +LOCAL_MODULE_TAGS := optional + LOCAL_ARM_MODE := arm LOCAL_PRELINK_MODULE := false diff --git a/src/starter/Android.mk b/src/starter/Android.mk index 48e4b0b27..1c7a31b9a 100644 --- a/src/starter/Android.mk +++ b/src/starter/Android.mk @@ -30,6 +30,8 @@ endif LOCAL_MODULE := starter +LOCAL_MODULE_TAGS := optional + LOCAL_ARM_MODE := arm LOCAL_PRELINK_MODULE := false diff --git a/src/stroke/Android.mk b/src/stroke/Android.mk index 833130e25..69b3e54ca 100644 --- a/src/stroke/Android.mk +++ b/src/stroke/Android.mk @@ -15,6 +15,8 @@ LOCAL_CFLAGS := $(strongswan_CFLAGS) LOCAL_MODULE := stroke +LOCAL_MODULE_TAGS := optional + LOCAL_ARM_MODE := arm LOCAL_PRELINK_MODULE := false diff --git a/src/whack/Android.mk b/src/whack/Android.mk index 08d96a071..bf5ec0e98 100644 --- a/src/whack/Android.mk +++ b/src/whack/Android.mk @@ -18,6 +18,8 @@ LOCAL_CFLAGS := $(strongswan_CFLAGS) LOCAL_MODULE := whack +LOCAL_MODULE_TAGS := optional + LOCAL_ARM_MODE := arm LOCAL_PRELINK_MODULE := false