diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-02-10 12:51:41 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-02-10 12:51:41 +0100 |
| commit | f9c91930126bb20165a5621a35a012a00ec108c3 (patch) | |
| tree | 03617e65ba322a073d98bd08d34eba83065f7790 /android/src | |
| parent | Simplify fix for (ICE-6288) to not depend on ruby internals (diff) | |
| download | ice-f9c91930126bb20165a5621a35a012a00ec108c3.tar.bz2 ice-f9c91930126bb20165a5621a35a012a00ec108c3.tar.xz ice-f9c91930126bb20165a5621a35a012a00ec108c3.zip | |
Removed IceDiscovery from android, UDP multicast isn't supported
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/IceDiscovery/build.gradle | 20 | ||||
| -rw-r--r-- | android/src/IceDiscovery/icediscovery.iml | 35 |
2 files changed, 0 insertions, 55 deletions
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> - |