diff options
| author |   Mauro Sardara <msardara@cisco.com> | 2019-05-16 15:46:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2019-05-16 15:46:10 +0000 |
| commit | 41ed041613107ae6f1bf9cae5147cfdc71a1ba54 (patch) | |
| tree | c67e8bcd830e348c0a905fe52d48a248c0031132 /utils | |
| parent | db8d063677b42c0ec8191728e55d1d5efef80822 (diff) | |
| parent | 5c9b2cd16e76b7d731bd31422b4a555dbeff1541 (diff) | |
Merge "[HICN-195] Generate static libs for android"
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | utils/src/ping_client.cc | 2 |
2 files changed, 8 insertions, 1 deletions
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> |