Removed IceDiscovery from android, UDP multicast isn't supported

5 files changed, 0 insertions, 59 deletions

diff --git a/android/.idea/gradle.xml b/android/.idea/gradle.xml
index 14f06d011ba..ec8cf4be850 100644
--- a/android/.idea/gradle.xml
+++ b/android/.idea/gradle.xml
@@ -16,7 +16,6 @@
             <option value="$PROJECT_DIR$/src/Glacier2" />
             <option value="$PROJECT_DIR$/src/Ice" />
             <option value="$PROJECT_DIR$/src/IceBox" />
-            <option value="$PROJECT_DIR$/src/IceDiscovery" />
             <option value="$PROJECT_DIR$/src/IceGrid" />
             <option value="$PROJECT_DIR$/src/IcePatch2" />
             <option value="$PROJECT_DIR$/src/IceStorm" />
diff --git a/android/.idea/modules.xml b/android/.idea/modules.xml
index 2f31308dd93..e065fb69f70 100644
--- a/android/.idea/modules.xml
+++ b/android/.idea/modules.xml
@@ -9,7 +9,6 @@
       <module fileurl="file://$PROJECT_DIR$/demo/hello/hello.iml" filepath="$PROJECT_DIR$/demo/hello/hello.iml" />
       <module fileurl="file://$PROJECT_DIR$/src/Ice/ice.iml" filepath="$PROJECT_DIR$/src/Ice/ice.iml" />
       <module fileurl="file://$PROJECT_DIR$/src/IceBox/icebox.iml" filepath="$PROJECT_DIR$/src/IceBox/icebox.iml" />
-      <module fileurl="file://$PROJECT_DIR$/src/IceDiscovery/icediscovery.iml" filepath="$PROJECT_DIR$/src/IceDiscovery/icediscovery.iml" />
       <module fileurl="file://$PROJECT_DIR$/src/IceGrid/icegrid.iml" filepath="$PROJECT_DIR$/src/IceGrid/icegrid.iml" />
       <module fileurl="file://$PROJECT_DIR$/src/IcePatch2/icepatch2.iml" filepath="$PROJECT_DIR$/src/IcePatch2/icepatch2.iml" />
       <module fileurl="file://$PROJECT_DIR$/src/IceStorm/icestorm.iml" filepath="$PROJECT_DIR$/src/IceStorm/icestorm.iml" />
diff --git a/android/settings.gradle b/android/settings.gradle
index 183011e6b27..dc0fb7f7a0d 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -17,8 +17,6 @@ tests.each {
 // Main source
 include ':ice'
 project(':ice').projectDir = new File('src/Ice')
-include ':icediscovery'
-project(':icediscovery').projectDir = new File('src/IceDiscovery')
 include	':freeze'
 project(':freeze').projectDir = new File('src/Freeze')
 include	':icebox'
diff --git a/android/src/IceDiscovery/build.gradle b/android/src/IceDiscovery/build.gradle
deleted file mode 100644
index f928dca012f..00000000000
--- a/android/src/IceDiscovery/build.gradle
+++ /dev/null
@@ -1,20 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-apply plugin: 'java'
-apply from: "$rootProject.projectDir/../java/gradle/ice.gradle"
-apply from: "$rootProject.projectDir/../java/src/IceDiscovery/build.gradle"
-
-sourceSets {
-    main {
-        java {
-            srcDir "$rootProject.projectDir/../java/src/IceDiscovery/src/main/java"
-        }
-    }
-}
diff --git a/android/src/IceDiscovery/icediscovery.iml b/android/src/IceDiscovery/icediscovery.iml
deleted file mode 100644
index 0bd202eb601..00000000000
--- a/android/src/IceDiscovery/icediscovery.iml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="com.zeroc" external.system.module.version="3.6.0" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android-gradle" name="Android-Gradle">
-      <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":icediscovery" />
-      </configuration>
-    </facet>
-    <facet type="java-gradle" name="Java-Gradle">
-      <configuration>
-        <option name="BUILD_FOLDER_PATH" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated-src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../java/src/IceDiscovery/src/main/java">
-      <sourceFolder url="file://$MODULE_DIR$/../../../java/src/IceDiscovery/src/main/java" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="ice" exported="" />
-  </component>
-</module>
-