From 636eb1d9ded2b7d0d5462b8be3d366612d80d0d0 Mon Sep 17 00:00:00 2001 From: Kevin Rocard Date: Tue, 9 Jun 2015 19:13:58 +0200 Subject: [PATCH] Android: Link to shared library xmlSerializer The Parameter Framework has recently removed (this trick was not working on osx) its *_include libraries. They were used to include headers without linking against the libraries in the android build system. There is two way to include headers from a library: - copy the headers (but that would be in contradiction with how the main pfw headers are included) - link against the library (chosen solution) To avoid linking against a static libxmlserializer - ie add it and its dependency to all plugins - the xmlserializer library is now dynamic. Link against the dynamic library xmlserializer and no longer use *_include. Change-Id: I1811a7ab1c5f892adadb8709b8fefa58ebad4542 Signed-off-by: Kevin Rocard --- Android.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Android.mk b/Android.mk index f8b9c9a..0a8b260 100644 --- a/Android.mk +++ b/Android.mk @@ -41,10 +41,7 @@ LOCAL_CFLAGS := \ -Wextra \ -Wno-unused-parameter # Needed to workaround STL bug -LOCAL_SHARED_LIBRARIES := libparameter -LOCAL_STATIC_LIBRARIES := \ - libparameter_includes \ - libxmlserializer_includes +LOCAL_SHARED_LIBRARIES := libparameter libxmlserializer LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libfs-subsystem