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.
This commit is contained in:
Tobias Brunner 2012-01-12 19:14:11 +01:00
parent 35a1986142
commit 2e0b478a01
13 changed files with 33 additions and 3 deletions

View File

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

View File

@ -17,6 +17,8 @@ LOCAL_CFLAGS := $(strongswan_CFLAGS)
LOCAL_MODULE := charon
LOCAL_MODULE_TAGS := optional
LOCAL_ARM_MODE := arm
LOCAL_PRELINK_MODULE := false

View File

@ -5,6 +5,8 @@ include $(CLEAR_VARS)
LOCAL_MODULE := ipsec
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := EXECUTABLES
GEN := $(local-intermediates-dir)/ipsec

View File

@ -165,6 +165,8 @@ LOCAL_CFLAGS := $(strongswan_CFLAGS) \
LOCAL_MODULE := libcharon
LOCAL_MODULE_TAGS := optional
LOCAL_ARM_MODE := arm
LOCAL_PRELINK_MODULE := false

View File

@ -26,6 +26,8 @@ LOCAL_CFLAGS := $(strongswan_CFLAGS)
LOCAL_MODULE := libfreeswan
LOCAL_MODULE_TAGS := optional
LOCAL_ARM_MODE := arm
LOCAL_PRELINK_MODULE := false

View File

@ -32,6 +32,8 @@ LOCAL_CFLAGS := $(strongswan_CFLAGS)
LOCAL_MODULE := libhydra
LOCAL_MODULE_TAGS := optional
LOCAL_ARM_MODE := arm
LOCAL_PRELINK_MODULE := false

View File

@ -128,6 +128,8 @@ LOCAL_CFLAGS := $(strongswan_CFLAGS) \
LOCAL_MODULE := libstrongswan
LOCAL_MODULE_TAGS := optional
LOCAL_ARM_MODE := arm
LOCAL_PRELINK_MODULE := false

View File

@ -21,6 +21,8 @@ LOCAL_CFLAGS := $(strongswan_CFLAGS)
LOCAL_MODULE := libtnccs
LOCAL_MODULE_TAGS := optional
LOCAL_ARM_MODE := arm
LOCAL_PRELINK_MODULE := false

View File

@ -16,6 +16,8 @@ LOCAL_CFLAGS := $(strongswan_CFLAGS)
LOCAL_MODULE := libtncif
LOCAL_MODULE_TAGS := optional
LOCAL_ARM_MODE := arm
LOCAL_PRELINK_MODULE := false

View File

@ -69,6 +69,8 @@ LOCAL_CFLAGS := $(strongswan_CFLAGS) \
LOCAL_MODULE := pluto
LOCAL_MODULE_TAGS := optional
LOCAL_ARM_MODE := arm
LOCAL_PRELINK_MODULE := false

View File

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

View File

@ -15,6 +15,8 @@ LOCAL_CFLAGS := $(strongswan_CFLAGS)
LOCAL_MODULE := stroke
LOCAL_MODULE_TAGS := optional
LOCAL_ARM_MODE := arm
LOCAL_PRELINK_MODULE := false

View File

@ -18,6 +18,8 @@ LOCAL_CFLAGS := $(strongswan_CFLAGS)
LOCAL_MODULE := whack
LOCAL_MODULE_TAGS := optional
LOCAL_ARM_MODE := arm
LOCAL_PRELINK_MODULE := false