update android-sdk. Now it is possible to compile with clangandroid-sdk/master

Change-Id: I156aa48dd90467a2a7540eec11839c0111b13bd2
Signed-off-by: Angelo Mantellini <angelo.mantellini@irt-systemx.fr>

2 files changed, 0 insertions, 69 deletions

diff --git a/MetisForwarder/app/src/main/java/com/metis/ccnx/utility/Constants.java b/MetisForwarder/app/src/main/java/com/metis/ccnx/utility/Constants.java
deleted file mode 100644
index f25bc825..00000000
--- a/MetisForwarder/app/src/main/java/com/metis/ccnx/utility/Constants.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.metis.ccnx.utility;
-
-/**
- * Created by angelomantellini on 18/05/2017.
- */
-
-public class Constants {
-    public static final String DEFAULT_NEXT_HOP_IP = "10.60.17.200";
-    public static final String DEFAULT_NEXT_HOP_PORT = "11111";
-    public static final String DEFAULT_PREFIX = "ccnx:/webserver";
-    public static final String ENABLED = "Enabled";
-    public static final String DISABLED = "Disabled";
-    public static final String METIS_FORWARDER_PREFERENCES = "metisForwarderPreferences";
-    public static final String DEFAULT_SOURCE_INTERFACE = "eth0";
-    public static final String DEFAULT_SOURCE_PORT = "11111";
-    public static final String DEFAULT_CONFIGURATION = "add listener tcp local0 127.0.0.1 9695\n" +
-            "add listener udp remote0 %%source_ip%% %%source_port%%\n" +
-            "add connection udp conn0 %%next_hop_ip%% %%next_hop_port%% %%source_ip%% %%source_port%%\n" +
-            "add route conn0 %%prefix%% 1";
-
-
-
-            //"add connection udp conn0 %%next_ip%% %%next_port_ip%% %%source_ip%% %%source_port%%\n" +
-            //"add route conn0 %%prefix%%";
-    public static final String SOURCE_IP = "%%source_ip%%";
-    public static final String SOURCE_PORT = "%%source_port%%";
-    public static final String NEXT_HOP_IP = "%%next_hop_ip%%";
-    public static final String NEXT_HOP_PORT = "%%next_hop_port%%";
-    public static final String PREFIX = "%%prefix%%";
-    public static final String NETMASK = "%%netmask%%";
-    public static final String CONFIGURATION_PATH = "Configuration";
-    public static final String CONFIGURATION_FILE_NAME = "metis_forwarder.conf";
-    public static final int FOREGROUND_SERVICE = 101;
-}
diff --git a/MetisForwarder/app/src/main/java/com/metis/ccnx/utility/ResourcesEnumerator.java b/MetisForwarder/app/src/main/java/com/metis/ccnx/utility/ResourcesEnumerator.java
deleted file mode 100644
index 85284f86..00000000
--- a/MetisForwarder/app/src/main/java/com/metis/ccnx/utility/ResourcesEnumerator.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2017 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.
- */
-package com.metis.ccnx.utility;
-
-public enum ResourcesEnumerator {
-    SOURCE_IP("sourceIp"),
-    SOURCE_PORT("sourcePort"),
-    NEXT_HOP_IP("nextHopIp"),
-    NEXT_HOP_PORT("nextHopPort"),
-    CONFIGURATION("configuration"),
-    SOURCE_NETWORK_INTERFACE("sourceNetworkInterface"),
-    PREFIX("prefix");
-
-    private String key;
-
-    ResourcesEnumerator(String key) {
-        this.key = key;
-    }
-
-    public String key() {
-        return key;
-    }
-}