diff options
| author |   Angelo Mantellini <manangel@cisco.com> | 2019-05-14 16:05:53 +0200 |
|---|---|---|
| committer | Angelo Mantellini <manangel@cisco.com> | 2019-05-16 13:48:23 +0200 |
| commit | 5c9b2cd16e76b7d731bd31422b4a555dbeff1541 (patch) | |
| tree | 1ab57c1e0eb10374879803ef9aee36724ad875ef /hicn-light/src/hicn/socket | |
| parent | 8a4273ffe83b46bc018da58135427d40012282b8 (diff) | |
[HICN-195] Generate static libs for android
Change-Id: Ib78e0ba5108713c6fac0e422eb7bb6f7ba10abc7
Signed-off-by: Angelo Mantellini <manangel@cisco.com>
Diffstat (limited to 'hicn-light/src/hicn/socket')
| -rw-r--r-- | hicn-light/src/hicn/socket/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | hicn-light/src/hicn/socket/ops_linux.c | 5 |
2 files changed, 11 insertions, 2 deletions
diff --git a/hicn-light/src/hicn/socket/CMakeLists.txt b/hicn-light/src/hicn/socket/CMakeLists.txt index 6ea94dcfa..ce2a9caf4 100644 --- a/hicn-light/src/hicn/socket/CMakeLists.txt +++ b/hicn-light/src/hicn/socket/CMakeLists.txt @@ -13,7 +13,7 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR) -if (UNIX AND NOT APPLE AND NOT ANDROID_API) +if (UNIX AND NOT APPLE) list(APPEND HEADER_FILES socket/api.h socket/error.h @@ -27,5 +27,11 @@ if (UNIX AND NOT APPLE AND NOT ANDROID_API) ) endif() +set(TO_INSTALL_HEADER_FILES + ${TO_INSTALL_HEADER_FILES} + ${HEADER_FILES} + PARENT_SCOPE +) + set(SOURCE_FILES ${SOURCE_FILES} PARENT_SCOPE) set(HEADER_FILES ${HEADER_FILES} PARENT_SCOPE)
\ No newline at end of file diff --git a/hicn-light/src/hicn/socket/ops_linux.c b/hicn-light/src/hicn/socket/ops_linux.c index d085f0d3d..1356e1ba0 100644 --- a/hicn-light/src/hicn/socket/ops_linux.c +++ b/hicn-light/src/hicn/socket/ops_linux.c @@ -224,7 +224,9 @@ int _nl_del_lo_prio_rule(const ip_address_t *ip_address, #define FLAGS_LIST NLM_F_REQUEST | NLM_F_DUMP +#ifndef __ANDROID__ #define IF_NAMESIZE 16 +#endif #define FR_ACT_TO_TBL 1 #define NLMSG_BOTTOM(nlmsg) \ ((struct rtattr *)(((void *)(nlmsg)) + NLMSG_ALIGN((nlmsg)->nlmsg_len))) @@ -1539,8 +1541,9 @@ int _nl_del_lo_prio_rule(const ip_address_t *ip_address, uint8_t address_family, // #include <net/if.h> // duplicate declarations, in the meantime +#ifndef __ANDROID__ #define IF_NAMESIZE 16 - +#endif //#define WITH_TUN_PI 1 #ifdef WITH_TUN_PI |