From: Tobias Brunner <tobias@strongswan.org>
Date: Thu, 12 Jan 2012 18:14:11 +0000 (+0100)
Subject: Android 4 requires LOCAL_MODULE_TAGS to be set for all modules.
X-Git-Tag: 4.6.2~57
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2e0b478a01cbd5df831e9d963a4e133194fcce12;p=thirdparty%2Fstrongswan.git

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.
---

diff --git a/Android.mk.in b/Android.mk.in
index c110bc6734..e1f0613503 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 491d7f946f..eb7eca9dd0 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 b6a7c714dc..d134f7fd20 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 1a46787a2d..f98d36a61a 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 e9805f0a39..a834d48465 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 ccc527f94e..075f8dbcb2 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 b6897c4c3a..d33bee6c7f 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 0055fce34a..a4bbc13f59 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 91cfa8354a..ef406dd59d 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 4c4bdca925..618f79c42a 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 48e4b0b273..1c7a31b9ac 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 833130e259..69b3e54ca7 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 08d96a0712..bf5ec0e98e 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