Skip to content
This repository has been archived by the owner on Aug 5, 2022. It is now read-only.

Commit

Permalink
Merge pull request #8 from 01org/remove_include_library_trick
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
krocard committed Jun 10, 2015
2 parents 464373f + 636eb1d commit b56a3e8
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b56a3e8

Please sign in to comment.