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 c110bc67347444137550f3c858d65485f5e00936..e1f0613503513cfbff99d92951a1d02ec4202048 100644 (file)
--- 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 491d7f946f9b13720e6eca5a34e8b1f7583b65d2..eb7eca9dd0aaf3532c06a612dd6651936f6489eb 100644 (file)
--- 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 b6a7c714dc613da8fb9cb0f9f35ebf16fda5a5bf..d134f7fd20e06a6ec984d4d4291dd63d30b04196 100644 (file)
--- 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 1a46787a2d4696d7e96b144aad4ef79d91d0af20..f98d36a61ab00859a59fb14618ff2a74d683e650 100644 (file)
--- 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 e9805f0a39bebf6607d7b879c66af3406de8f6b6..a834d484658722e4485bed2794de7566bf833ac7 100644 (file)
--- 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 ccc527f94eb40c796c569628b3ffa157a83c5a13..075f8dbcb2d2cd3b77cd47ca81c54f3a120a4b00 100644 (file)
--- 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 b6897c4c3ae23730a3819195555a9cbc0eb13753..d33bee6c7f723b9dd8be42baff6a992165a19e2d 100644 (file)
--- 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 0055fce34ab624bf447f7aaf9de760db29aa0019..a4bbc13f59dc8790546900748c7471c28c31b807 100644 (file)
--- 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 91cfa8354abde1239f7de1fa8f532737d6edccf6..ef406dd59d0043879d69d7c168dd0dcf5a7c8e9b 100644 (file)
--- 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 4c4bdca92536c573e957e8ced31b257c06465631..618f79c42a03b49e51937bceef6eee34c3d08f96 100644 (file)
--- 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 48e4b0b273020a2ce516c9d28bc07d6ea6eea71e..1c7a31b9ace93267779e29a494068fecd1c30ad7 100644 (file)
--- 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 833130e2593d70c46c8292456e87b2b01c2c69a5..69b3e54ca7b2f46b8917fd34be5eeea3777b67b7 100644 (file)
--- 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 08d96a0712f3500f7dea3c0cf8f56149c118bb6c..bf5ec0e98e4048b5493b8332a7eb4dad892d9d77 100644 (file)
--- 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