summaryrefslogtreecommitdiff
path: root/android/src
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2015-05-12 15:53:25 +0200
committerBenoit Foucher <benoit@zeroc.com>2015-05-12 15:53:25 +0200
commitf9c48af84ae5f3a47989b018f40968b5f94b9732 (patch)
tree66e371665c86aa2d38b0ebfbd3faaa2a6399c6cc /android/src
parentICE-6491 duplicate error for invalid class/interface names (diff)
downloadice-f9c48af84ae5f3a47989b018f40968b5f94b9732.tar.bz2
ice-f9c48af84ae5f3a47989b018f40968b5f94b9732.tar.xz
ice-f9c48af84ae5f3a47989b018f40968b5f94b9732.zip
Fixed ICE-6501: android SSL test failure and other minor Android test failures
Diffstat (limited to 'android/src')
-rw-r--r--android/src/Ice/ice.iml5
1 files changed, 0 insertions, 5 deletions
diff --git a/android/src/Ice/ice.iml b/android/src/Ice/ice.iml
index f83cc28c0d0..f5517a7190d 100644
--- a/android/src/Ice/ice.iml
+++ b/android/src/Ice/ice.iml
@@ -23,11 +23,6 @@
<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" />
- <excludeFolder url="file://$MODULE_DIR$/build/classes" />
- <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
- <excludeFolder url="file://$MODULE_DIR$/build/nostream.d.xml" />
- <excludeFolder url="file://$MODULE_DIR$/build/stream.d.xml" />
- <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<content url="file://$MODULE_DIR$/../../../java/src/Ice/src/main/java">
<sourceFolder url="file://$MODULE_DIR$/../../../java/src/Ice/src/main/java" isTestSource="false" />