From 0a0e51426506985ae1e7cf8c581d109fdad7a725 Mon Sep 17 00:00:00 2001
From: Angelo Mantellini <manangel@cisco.com>
Date: Mon, 13 May 2019 14:42:24 +0200
Subject: [HICN-194] support for android environment

Change-Id: I11a614709152035784e492ccd99bc383765a0aa1
Signed-off-by: Angelo Mantellini <manangel@cisco.com>
---
 hicn-light/CMakeLists.txt            | 2 ++
 hicn-light/src/hicn/api/api.c        | 5 +++++
 hicn-light/src/hicn/api/ip_address.h | 7 +++++++
 3 files changed, 14 insertions(+)

(limited to 'hicn-light')

diff --git a/hicn-light/CMakeLists.txt b/hicn-light/CMakeLists.txt
index c9f90de6a..70ca8ed15 100644
--- a/hicn-light/CMakeLists.txt
+++ b/hicn-light/CMakeLists.txt
@@ -70,6 +70,8 @@ include( Packaging )
 
 find_package(Threads REQUIRED)
 
+find_package(OpenSSL REQUIRED)
+
 set(HICN_LIGHT_LINK_LIBRARIES
   hicn-light
   ${HICN_LIBRARIES}
diff --git a/hicn-light/src/hicn/api/api.c b/hicn-light/src/hicn/api/api.c
index 9b3882379..e139734f5 100644
--- a/hicn-light/src/hicn/api/api.c
+++ b/hicn-light/src/hicn/api/api.c
@@ -27,6 +27,11 @@
 
 #include <stdio.h>  // XXX debug
 
+#ifndef bzero
+#define bzero(b,len) (memset((b), '\0', (len)), (void) 0)
+#endif
+
+
 #include <hicn/api/api.h>
 #include <hicn/api/commands.h>
 #include <hicn/api/ip_address.h>
diff --git a/hicn-light/src/hicn/api/ip_address.h b/hicn-light/src/hicn/api/ip_address.h
index b58981d85..f44fb1bc3 100644
--- a/hicn-light/src/hicn/api/ip_address.h
+++ b/hicn-light/src/hicn/api/ip_address.h
@@ -27,6 +27,9 @@
 #include <machine/endian.h>
 #else
 #include <endian.h>
+#ifdef __ANDROID__
+#include <byteswap.h>
+#endif
 #endif
 #include <errno.h>
 #include <netdb.h>       // struct addrinfo
@@ -82,7 +85,11 @@ typedef union {
 /* No htonl() with const */
 static const ip_address_t IPV4_LOOPBACK = {
 #if __BYTE_ORDER == __LITTLE_ENDIAN
+#ifdef __ANDROID__
+    .v4.as_inaddr.s_addr = bswap_32(INADDR_LOOPBACK),
+#else
     .v4.as_inaddr.s_addr = __bswap_constant_32(INADDR_LOOPBACK),
+#endif
 #else
     .v4.as_inaddr.s_addr = INADDR_LOOPBACK,
 #endif
-- 
cgit 1.2.3-korg