From 5c9b2cd16e76b7d731bd31422b4a555dbeff1541 Mon Sep 17 00:00:00 2001
From: Angelo Mantellini <manangel@cisco.com>
Date: Tue, 14 May 2019 16:05:53 +0200
Subject: [HICN-195] Generate static libs for android

Change-Id: Ib78e0ba5108713c6fac0e422eb7bb6f7ba10abc7
Signed-off-by: Angelo Mantellini <manangel@cisco.com>
---
 utils/CMakeLists.txt     | 7 ++++++-
 utils/src/ping_client.cc | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'utils')

diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index b1993e740..c78110949 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -29,7 +29,12 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
   find_package(Libtransport REQUIRED)
   set(HICN_UTILS hicn-utils)
 else()
-  set(LIBTRANSPORT_LIBRARIES ${LIBTRANSPORT_SHARED})
+  if (ANDROID_API)
+    set(LIBTRANSPORT_LIBRARIES ${LIBTRANSPORT})
+  else ()
+    set(LIBTRANSPORT_LIBRARIES ${LIBTRANSPORT_SHARED})
+  endif ()
+
 endif()
 
 set(SUFFIX "")
diff --git a/utils/src/ping_client.cc b/utils/src/ping_client.cc
index d72177830..f88bc7eec 100644
--- a/utils/src/ping_client.cc
+++ b/utils/src/ping_client.cc
@@ -18,8 +18,10 @@
 
 // Let's make the linker happy
 #if !TRANSPORT_LOG_EXTERN_GLOBAL_OUTPUT_LEVEL
+#ifndef TRANSPORT_LOG_DEFINE_GLOBAL_OUTPUT_LEVEL
 TRANSPORT_LOG_DEFINE_GLOBAL_OUTPUT_LEVEL = 0;
 #endif
+#endif
 
 #include <asio/steady_timer.hpp>
 #include <chrono>
-- 
cgit 1.2.3-korg