Use vstr/gmp as shared libraries in the Android build.

diff --git a/src/libcharon/Android.mk b/src/libcharon/Android.mk
index 3fbd24bb56a781dfcf9111096a1defe76c9018bc..7588533bc6a333ffdf1775c1b4f41487a68fc91c 100644 (file)
--- a/src/libcharon/Android.mk
+++ b/src/libcharon/Android.mk
@@ -116,7 +116,7 @@ LOCAL_SRC_FILES += $(call add_plugin, eap-aka)
 LOCAL_SRC_FILES += $(call add_plugin, eap-aka-3gpp2)
 ifneq ($(call plugin_enabled, eap-aka-3gpp2)),)
 LOCAL_C_INCLUDES += $(libgmp_PATH)
-LOCAL_STATIC_LIBRARIES += libgmp
+LOCAL_SHARED_LIBRARIES += libgmp
 endif
 
 LOCAL_SRC_FILES += $(call add_plugin, eap-gtc)

diff --git a/src/libstrongswan/Android.mk b/src/libstrongswan/Android.mk
index d16f970523b51cd643557e1a62ee21c3a1e61604..2dc4e58badffd65de6f5d7a9bf12bb679214e16b 100644 (file)
--- a/src/libstrongswan/Android.mk
+++ b/src/libstrongswan/Android.mk
@@ -73,7 +73,7 @@ LOCAL_SRC_FILES += $(call add_plugin, fips-prf)
 LOCAL_SRC_FILES += $(call add_plugin, gmp)
 ifneq ($(call plugin_enabled, gmp)),)
 LOCAL_C_INCLUDES += $(libgmp_PATH)
-LOCAL_STATIC_LIBRARIES += libgmp
+LOCAL_SHARED_LIBRARIES += libgmp
 endif
 
 LOCAL_SRC_FILES += $(call add_plugin, hmac)
@@ -118,9 +118,7 @@ LOCAL_ARM_MODE := arm
 
 LOCAL_PRELINK_MODULE := false
 
-LOCAL_SHARED_LIBRARIES += libdl
-
-LOCAL_STATIC_LIBRARIES += libvstr
+LOCAL_SHARED_LIBRARIES += libdl libvstr
 
 include $(BUILD_SHARED_LIBRARY)