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

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

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

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

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

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

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

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

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

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

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

src/starter/Android.mk

@@ -30,6 +30,8 @@ endif
 
 LOCAL_MODULE := starter
 
+LOCAL_MODULE_TAGS := optional
+
 LOCAL_ARM_MODE := arm
 
 LOCAL_PRELINK_MODULE := false

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

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