summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJordan Augé <jordan.auge+fdio@cisco.com>2020-02-12 16:35:34 +0100
committerJordan Augé <jordan.auge+fdio@cisco.com>2020-02-12 16:39:15 +0100
commit38cc8fb5b1c4d315648a5cc53bb0e874d54f436a (patch)
treefdb24a5e754dba001531df26d5edd4237e191e8b
parentcea443f1b7d1750ac061b33b2200997ad59e8505 (diff)
[HICN-516] remove facemgr android-utility header from installed ones
Change-Id: I72018d73fdf0a295c6121efd38b0ce1a00519dd5 Signed-off-by: Jordan Augé <jordan.auge+fdio@cisco.com>
-rw-r--r--ctrl/facemgr/includes/CMakeLists.txt1
-rw-r--r--ctrl/facemgr/includes/hicn/facemgr/api.h2
-rw-r--r--ctrl/facemgr/src/api.c2
-rw-r--r--ctrl/facemgr/src/interfaces/android_utility/android_utility.c3
-rw-r--r--ctrl/facemgr/src/interfaces/android_utility/android_utility.h (renamed from ctrl/facemgr/includes/hicn/android_utility/android_utility.h)0
5 files changed, 4 insertions, 4 deletions
diff --git a/ctrl/facemgr/includes/CMakeLists.txt b/ctrl/facemgr/includes/CMakeLists.txt
index d2510c205..065a9022f 100644
--- a/ctrl/facemgr/includes/CMakeLists.txt
+++ b/ctrl/facemgr/includes/CMakeLists.txt
@@ -26,7 +26,6 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Android")
${CMAKE_CURRENT_SOURCE_DIR}/hicn/facemgr/cfg.h
${CMAKE_CURRENT_SOURCE_DIR}/hicn/facemgr/facelet.h
${CMAKE_CURRENT_SOURCE_DIR}/hicn/facemgr/loop.h
- ${CMAKE_CURRENT_SOURCE_DIR}/hicn/android_utility/android_utility.h
PARENT_SCOPE
)
diff --git a/ctrl/facemgr/includes/hicn/facemgr/api.h b/ctrl/facemgr/includes/hicn/facemgr/api.h
index fcc31eb37..e9d25f132 100644
--- a/ctrl/facemgr/includes/hicn/facemgr/api.h
+++ b/ctrl/facemgr/includes/hicn/facemgr/api.h
@@ -24,7 +24,7 @@
#include <hicn/facemgr/facelet.h>
#include <hicn/util/ip_address.h>
#ifdef __ANDROID__
-#include <hicn/android_utility/android_utility.h>
+#include <jni.h>
#endif
/* facemgr callbacks */
diff --git a/ctrl/facemgr/src/api.c b/ctrl/facemgr/src/api.c
index 24d629d28..f934883de 100644
--- a/ctrl/facemgr/src/api.c
+++ b/ctrl/facemgr/src/api.c
@@ -60,7 +60,7 @@
#endif /* __linux__ */
#ifdef WITH_ANDROID_UTILITY
-#include <hicn/android_utility/android_utility.h>
+#include "interfaces/android_utility/android_utility.h"
#endif /* WITH_ANDROID_UTILITY */
#include <hicn/ctrl/face.h>
diff --git a/ctrl/facemgr/src/interfaces/android_utility/android_utility.c b/ctrl/facemgr/src/interfaces/android_utility/android_utility.c
index 8eca6c2b0..d1fe324fb 100644
--- a/ctrl/facemgr/src/interfaces/android_utility/android_utility.c
+++ b/ctrl/facemgr/src/interfaces/android_utility/android_utility.c
@@ -25,7 +25,8 @@
#include <hicn/util/log.h>
#include "../../common.h"
#include "../../interface.h"
-#include <hicn/android_utility/android_utility.h>
+
+#include "android_utility.h"
#define FACEMGR_ANDROID_UTILITY_CLASS "com/cisco/hicn/forwarder/supportlibrary/AndroidUtility"
diff --git a/ctrl/facemgr/includes/hicn/android_utility/android_utility.h b/ctrl/facemgr/src/interfaces/android_utility/android_utility.h
index 53adfedf6..53adfedf6 100644
--- a/ctrl/facemgr/includes/hicn/android_utility/android_utility.h
+++ b/ctrl/facemgr/src/interfaces/android_utility/android_utility.h