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>

5 files changed, 0 insertions, 489 deletions

diff --git a/MetisForwarder/app/src/main/java/com/metis/ccnx/metisforwarder/MetisForwarderActivity.java b/MetisForwarder/app/src/main/java/com/metis/ccnx/metisforwarder/MetisForwarderActivity.java
deleted file mode 100644
index 82e833bc..00000000
--- a/MetisForwarder/app/src/main/java/com/metis/ccnx/metisforwarder/MetisForwarderActivity.java
+++ /dev/null
@@ -1,233 +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.metisforwarder;
-
-import android.Manifest;
-import android.annotation.SuppressLint;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
-import android.content.res.Configuration;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.EditText;
-import android.widget.TextView;
-import android.util.Log;
-import android.widget.Switch;
-import android.widget.CompoundButton;
-import android.widget.Spinner;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-
-import java.net.Inet4Address;
-import java.net.Inet6Address;
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.net.SocketException;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.List;
-
-import metisforwarder.metis.com.metisforwarder.R;
-
-import com.metis.ccnx.service.MetisForwarderService;
-import com.metis.ccnx.supportlibrary.MetisForwarder;
-import com.metis.ccnx.utility.Constants;
-import com.metis.ccnx.utility.ResourcesEnumerator;
-
-
-public class MetisForwarderActivity extends AppCompatActivity {
-    private Spinner sourceIpSpinner;
-    private EditText sourcePortEditText;
-    private EditText nextHopIpEditText;
-    private EditText nextHopPortEditText;
-    private EditText configurationEditText;
-    private EditText prefixEditText;
-    private Switch metisForwarderSwitch;
-    private Button sourceIpRefreshButton;
-    private List<String> sourceIpArrayList = new ArrayList<String>();
-    private List<String> sourceNetworkInterfaceArrayList = new ArrayList<>();
-    private HashMap<String, String> addressesMap = new HashMap<String, String>();
-    private SharedPreferences sharedPreferences;
-    private View _selectedItemView;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_metis_forwarder);
-        checkEnabledPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE);
-        checkEnabledPermission(Manifest.permission.READ_EXTERNAL_STORAGE);
-        init();
-    }
-
-    public HashMap<String, String> getLocalIpAddress() {
-        HashMap<String, String> addressesMap = new HashMap<String, String>();
-        try {
-            for (Enumeration<NetworkInterface> en = NetworkInterface.getNetworkInterfaces(); en.hasMoreElements(); ) {
-                NetworkInterface intf = en.nextElement();
-                for (Enumeration<InetAddress> enumIpAddr = intf.getInetAddresses(); enumIpAddr.hasMoreElements(); ) {
-                    InetAddress inetAddress = enumIpAddr.nextElement();
-                    if (!inetAddress.isLoopbackAddress() && inetAddress instanceof Inet4Address) {
-                        String[] addressSplitted = inetAddress.getHostAddress().toString().split("%");
-                        //addressesMap.put(addressSplitted[1], addressSplitted[0]);
-                        addressesMap.put(intf.getName(), addressSplitted[0]);
-                    }
-                }
-            }
-        } catch (SocketException ex) {
-            String LOG_TAG = null;
-            Log.e(LOG_TAG, ex.toString());
-        }
-        return addressesMap;
-    }
-
-    private void checkEnabledPermission(String permission) {
-        if (ContextCompat.checkSelfPermission(this,
-                permission)
-                != PackageManager.PERMISSION_GRANTED) {
-            if (ActivityCompat.shouldShowRequestPermissionRationale(this,
-                    permission)) {
-            } else {
-                ActivityCompat.requestPermissions(this,
-                        new String[]{permission},
-                        1);
-            }
-        }
-    }
-
-    private void init() {
-        sourceIpSpinner = (Spinner) findViewById(R.id.sourceIpSpinner);
-        sharedPreferences = getSharedPreferences(Constants.METIS_FORWARDER_PREFERENCES, MODE_PRIVATE);
-        addressesMap = getLocalIpAddress();
-        for (String networkInterface : addressesMap.keySet()) {
-            sourceIpArrayList.add(networkInterface + ": " + addressesMap.get(networkInterface));
-            sourceNetworkInterfaceArrayList.add(networkInterface);
-        }
-        if (addressesMap.size() > 0) {
-            ArrayAdapter<String> sourceIpSpinnerArrayAdapter = new ArrayAdapter<String>(this,
-                    android.R.layout.simple_spinner_item, sourceIpArrayList);
-            sourceIpSpinnerArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-            sourceIpSpinnerArrayAdapter.setDropDownViewResource(R.layout.spinner_layout);
-            sourceIpSpinner.setAdapter(sourceIpSpinnerArrayAdapter);
-            if (sourceNetworkInterfaceArrayList.indexOf(sharedPreferences.getString(ResourcesEnumerator.SOURCE_NETWORK_INTERFACE.key(), Constants.DEFAULT_SOURCE_INTERFACE)) > -1) {
-                sourceIpSpinner.setSelection(sourceNetworkInterfaceArrayList.indexOf(sharedPreferences.getString(ResourcesEnumerator.SOURCE_NETWORK_INTERFACE.key(), Constants.DEFAULT_SOURCE_INTERFACE)));
-            } else {
-                sourceIpSpinner.setSelection(0);
-            }
-        }
-        sourcePortEditText = (EditText) findViewById(R.id.sourcePortEditText);
-        sourcePortEditText.setText(sharedPreferences.getString(ResourcesEnumerator.SOURCE_PORT.key(), Constants.DEFAULT_SOURCE_PORT));
-        sourceIpRefreshButton = (Button) findViewById(R.id.sourceIpRefreshButton);
-        sourceIpRefreshButton.setOnClickListener(new View.OnClickListener() {
-
-            @Override
-            public void onClick(View v) {
-                addressesMap = getLocalIpAddress();
-                sourceIpArrayList.clear();
-                sourceNetworkInterfaceArrayList.clear();
-                for (String networkInterface : addressesMap.keySet()) {
-                    sourceIpArrayList.add(networkInterface + ": " + addressesMap.get(networkInterface));
-                    sourceNetworkInterfaceArrayList.add(networkInterface);
-                }
-                if (addressesMap.size() > 0) {
-                    ArrayAdapter<String> sourceIpComboArrayAdapter = new ArrayAdapter<String>(v.getContext(),
-                            android.R.layout.simple_spinner_item, sourceIpArrayList);
-                    sourceIpComboArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-                    sourceIpComboArrayAdapter.setDropDownViewResource(R.layout.spinner_layout);
-                    sourceIpSpinner.setAdapter(sourceIpComboArrayAdapter);
-                    if (sourceNetworkInterfaceArrayList.indexOf(sharedPreferences.getString(ResourcesEnumerator.SOURCE_NETWORK_INTERFACE.key(), Constants.DEFAULT_SOURCE_INTERFACE)) > -1) {
-                        sourceIpSpinner.setSelection(sourceNetworkInterfaceArrayList.indexOf(sharedPreferences.getString(ResourcesEnumerator.SOURCE_NETWORK_INTERFACE.key(), Constants.DEFAULT_SOURCE_INTERFACE)));
-                    } else {
-                        sourceIpSpinner.setSelection(0);
-                    }
-                }
-            }
-        });
-        nextHopIpEditText = (EditText) findViewById(R.id.nextHopIpEditText);
-        nextHopIpEditText.setText(sharedPreferences.getString(ResourcesEnumerator.NEXT_HOP_IP.key(), Constants.DEFAULT_NEXT_HOP_IP));
-        nextHopPortEditText = (EditText) findViewById(R.id.nextHopPortEditText);
-        nextHopPortEditText.setText(sharedPreferences.getString(ResourcesEnumerator.NEXT_HOP_PORT.key(), Constants.DEFAULT_NEXT_HOP_PORT));
-
-        configurationEditText = (EditText) findViewById(R.id.configurationEditText);
-        //configurationEditText.setText(sharedPreferences.getString(ResourcesEnumerator.CONFIGURATION.key(), Constants.DEFAULT_CONFIGURATION));
-        configurationEditText.setText(Constants.DEFAULT_CONFIGURATION);
-        prefixEditText = (EditText) findViewById(R.id.prefixEditText);
-        prefixEditText.setText(sharedPreferences.getString(ResourcesEnumerator.PREFIX.key(), Constants.DEFAULT_PREFIX));
-        metisForwarderSwitch = (Switch) findViewById(R.id.metisForwarderSwitch);
-        metisForwarderSwitch.setText(Constants.DISABLED);
-        metisForwarderSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-
-            @Override
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                Log.v("Switch State=", "" + isChecked);
-                if (isChecked) {
-                    metisForwarderSwitch.setText(Constants.ENABLED);
-                    SharedPreferences.Editor sharedPreferencesEditor = getSharedPreferences(Constants.METIS_FORWARDER_PREFERENCES, MODE_PRIVATE).edit();
-                    sharedPreferencesEditor.putString(ResourcesEnumerator.SOURCE_NETWORK_INTERFACE.key(), sourceNetworkInterfaceArrayList.get(sourceIpSpinner.getSelectedItemPosition()));
-                    sharedPreferencesEditor.putString(ResourcesEnumerator.SOURCE_IP.key(), addressesMap.get(sourceNetworkInterfaceArrayList.get(sourceIpSpinner.getSelectedItemPosition())));
-                    sharedPreferencesEditor.putString(ResourcesEnumerator.SOURCE_PORT.key(), sourcePortEditText.getText().toString());
-                    sharedPreferencesEditor.putString(ResourcesEnumerator.NEXT_HOP_IP.key(), nextHopIpEditText.getText().toString());
-                    sharedPreferencesEditor.putString(ResourcesEnumerator.NEXT_HOP_PORT.key(), nextHopPortEditText.getText().toString());
-                    sharedPreferencesEditor.putString(ResourcesEnumerator.CONFIGURATION.key(), configurationEditText.getText().toString());
-                    sharedPreferencesEditor.putString(ResourcesEnumerator.PREFIX.key(), prefixEditText.getText().toString());
-                    sharedPreferencesEditor.commit();
-                    sourceIpSpinner.setEnabled(false);
-                    sourceIpRefreshButton.setEnabled(false);
-                    sourcePortEditText.setEnabled(false);
-                    nextHopIpEditText.setEnabled(false);
-                    nextHopPortEditText.setEnabled(false);
-                    prefixEditText.setEnabled(false);
-                    configurationEditText.setEnabled(false);
-                    startMetisForwarder();
-
-                } else {
-                    metisForwarderSwitch.setText(Constants.DISABLED);
-                    sourceIpSpinner.setEnabled(true);
-                    sourceIpRefreshButton.setEnabled(true);
-                    sourcePortEditText.setEnabled(true);
-                    nextHopIpEditText.setEnabled(true);
-                    nextHopPortEditText.setEnabled(true);
-                    prefixEditText.setEnabled(true);
-                    configurationEditText.setEnabled(true);
-                    stopMetisForwarder();
-                }
-            }
-
-        });
-
-
-    }
-
-    private void startMetisForwarder() {
-        Intent intent = new Intent(this, MetisForwarderService.class);
-        startService(intent);
-    }
-
-    private void stopMetisForwarder() {
-        Intent intent = new Intent(this, MetisForwarderService.class);
-
-        stopService(intent);
-    }
-
-    @Override
-    public void onConfigurationChanged(Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-    }
-}
diff --git a/MetisForwarder/app/src/main/java/com/metis/ccnx/service/MetisForwarderService.java b/MetisForwarder/app/src/main/java/com/metis/ccnx/service/MetisForwarderService.java
deleted file mode 100644
index 25d7c68a..00000000
--- a/MetisForwarder/app/src/main/java/com/metis/ccnx/service/MetisForwarderService.java
+++ /dev/null
@@ -1,145 +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.service;
-
-import android.app.Notification;
-import android.app.Service;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
-import android.os.IBinder;
-import android.util.Log;
-
-import com.metis.ccnx.supportlibrary.MetisForwarder;
-import com.metis.ccnx.utility.Constants;
-import com.metis.ccnx.utility.ResourcesEnumerator;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-
-public class MetisForwarderService extends Service {
-    private final static String TAG = "MetisForwarderService";
-
-    private static Thread sForwarderThread = null;
-
-    public MetisForwarderService() {
-    }
-
-    private String path;
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        return null;
-    }
-
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-
-        MetisForwarder metisForwarder = MetisForwarder.getInstance();
-        if (!metisForwarder.isRunning()) {
-            Log.d(TAG, "Starting Metis Forwarder");
-            SharedPreferences sharedPreferences = getSharedPreferences(Constants.METIS_FORWARDER_PREFERENCES, MODE_PRIVATE);
-            String configuration = sharedPreferences.getString(ResourcesEnumerator.CONFIGURATION.key(), Constants.DEFAULT_CONFIGURATION);
-            String sourceIp = sharedPreferences.getString(ResourcesEnumerator.SOURCE_IP.key(), null);
-            String sourcePort = sharedPreferences.getString(ResourcesEnumerator.SOURCE_PORT.key(), null);
-            String nextHopIp = sharedPreferences.getString(ResourcesEnumerator.NEXT_HOP_IP.key(), null);
-            String nextHopPort = sharedPreferences.getString(ResourcesEnumerator.NEXT_HOP_PORT.key(), null);
-            String prefix = sharedPreferences.getString(ResourcesEnumerator.PREFIX.key(), null);
-            configuration = configuration.replace(Constants.SOURCE_IP, sourceIp);
-            configuration = configuration.replace(Constants.SOURCE_PORT, sourcePort);
-            configuration = configuration.replace(Constants.NEXT_HOP_IP, nextHopIp);
-            configuration = configuration.replace(Constants.NEXT_HOP_PORT, nextHopPort);
-            configuration = configuration.replace(Constants.PREFIX, prefix);
-            try {
-                String configurationDir = getPackageManager().getPackageInfo(getPackageName(), 0).applicationInfo.dataDir +
-                        File.separator + Constants.CONFIGURATION_PATH;
-                File folder = new File(configurationDir);
-                if (!folder.exists()) {
-                    folder.mkdirs();
-                }
-
-                writeToFile(configuration, configurationDir + File.separator + Constants.CONFIGURATION_FILE_NAME);
-                startForwarder(intent, configurationDir + File.separator + Constants.CONFIGURATION_FILE_NAME);
-            } catch (PackageManager.NameNotFoundException e) {
-                Log.w(TAG, "Error Package name not found ", e);
-            }
-
-
-        } else {
-            Log.d(TAG, "Metis Forwarder already running.");
-        }
-        return Service.START_STICKY;
-    }
-
-
-    @Override
-    public void onDestroy() {
-        MetisForwarder metisForwarder = MetisForwarder.getInstance();
-        Log.d(TAG, "Destroying Metis Forwarder");
-        if (metisForwarder.isRunning()) {
-            metisForwarder.stop();
-            stopForeground(true);
-        }
-        super.onDestroy();
-    }
-
-    protected Runnable mForwarderRunner = new Runnable() {
-
-        //private String path;
-        @Override
-        public void run() {
-            MetisForwarder metisForwarder = MetisForwarder.getInstance();
-            metisForwarder.start(path);
-        }
-
-
-    };
-
-    private boolean writeToFile(String data, String path) {
-        Log.v(TAG, path + " " + data);
-        try (Writer writer = new BufferedWriter(new OutputStreamWriter(
-                new FileOutputStream(path), "utf-8"))) {
-            writer.write(data);
-            return true;
-        } catch (IOException e) {
-            Log.e(TAG, "File write failed: " + e.toString());
-            return false;
-        }
-    }
-
-
-    private void startForwarder(Intent intent, String path) {
-
-        int NOTIFICATION_ID = 12345;
-        startForeground(Constants.FOREGROUND_SERVICE, new Notification.Builder(this).build());
-        MetisForwarder metisForwarder = MetisForwarder.getInstance();
-        if (!metisForwarder.isRunning()) {
-           this.path = path;
-            sForwarderThread = new Thread(mForwarderRunner, "MetisForwarderRunner");
-            sForwarderThread.start();
-        }
-
-
-
-    }
-
-
-
-}
diff --git a/MetisForwarder/app/src/main/java/com/metis/ccnx/supportlibrary/MetisForwarder.java b/MetisForwarder/app/src/main/java/com/metis/ccnx/supportlibrary/MetisForwarder.java
deleted file mode 100644
index 45932cfa..00000000
--- a/MetisForwarder/app/src/main/java/com/metis/ccnx/supportlibrary/MetisForwarder.java
+++ /dev/null
@@ -1,42 +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.supportlibrary;
-
-public class MetisForwarder {
-
-    private static MetisForwarder sInstance = null;
-
-    static {
-        System.loadLibrary("metisForwarderWrap");
-    }
-
-    public static MetisForwarder getInstance() {
-        if (sInstance == null) {
-            sInstance = new MetisForwarder();
-        }
-        return sInstance;
-    }
-
-    private MetisForwarder() {
-
-    }
-
-    public native boolean isRunning();
-    public native void start(String path);
-    public native void stop();
-}
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;
-    }
-}