From 38cc8fb5b1c4d315648a5cc53bb0e874d54f436a Mon Sep 17 00:00:00 2001
From: Jordan Augé <jordan.auge+fdio@cisco.com>
Date: Wed, 12 Feb 2020 16:35:34 +0100
Subject: [HICN-516] remove facemgr android-utility header from installed ones
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I72018d73fdf0a295c6121efd38b0ce1a00519dd5
Signed-off-by: Jordan Augé <jordan.auge+fdio@cisco.com>
---
 ctrl/facemgr/includes/CMakeLists.txt               |  1 -
 .../hicn/android_utility/android_utility.h         | 48 ----------------------
 ctrl/facemgr/includes/hicn/facemgr/api.h           |  2 +-
 3 files changed, 1 insertion(+), 50 deletions(-)
 delete mode 100644 ctrl/facemgr/includes/hicn/android_utility/android_utility.h

(limited to 'ctrl/facemgr/includes')

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/android_utility/android_utility.h b/ctrl/facemgr/includes/hicn/android_utility/android_utility.h
deleted file mode 100644
index 53adfedf6..000000000
--- a/ctrl/facemgr/includes/hicn/android_utility/android_utility.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2017-2019 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * \file android_utility/android_utility.h
- * \brief Android utility.
- *
- * This class relies on a small utility wrapper shipped with the Android
- * application to access to Java SDK APIs for information not available to
- * native code.
- *
- * For instance, we currently don't have on Linux any mean to get the type
- * associated to an interface, especially for cellular interfaces. WiFi and
- * Bluetooth information is for instance available through specific netlink
- * subsystems, or by means of a support library, but cellular detection mostly
- * relies on heuristics based on interface names (eg. in network manager).
- *
- * Android ship a Radio Interface Layer (RIL) daemon that exposes a control
- * socket to the Java API to control the radio layer, but there is no working
- * code exploiting it and no proper documentation.
- */
-
-#ifndef FACEMGR_INTERFACE_ANDROID_UTILITY_H
-#define FACEMGR_INTERFACE_ANDROID_UTILITY_H
-
-#ifdef __ANDROID__
-
-#include <jni.h>
-
-typedef struct {
-    JavaVM *jvm;
-} android_utility_cfg_t;
-
-#endif /* __ANDROID__ */
-
-#endif /* FACEMGR_INTERFACE_ANDROID_UTILITY_H */
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 */
-- 
cgit 1.2.3-korg