From 29d1dd4ec39710767888f87e62b6d3fb4720706d Mon Sep 17 00:00:00 2001
From: Joe George <joe@zeroc.com>
Date: Fri, 12 Dec 2014 11:23:31 -0500
Subject: ICE-6169 - Android hello demo not catching batch exceptions

---
 android/test/android/testApp.iml     |  1 -
 android/test/plugins/testPlugins.iml |  3 +++
 android/test/test.iml                | 11 +++++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'android/test')

diff --git a/android/test/android/testApp.iml b/android/test/android/testApp.iml
index 299ec77ac2d..981662e19b1 100644
--- a/android/test/android/testApp.iml
+++ b/android/test/android/testApp.iml
@@ -80,7 +80,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 17 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/android/test/plugins/testPlugins.iml b/android/test/plugins/testPlugins.iml
index dbb8f1fdefc..916e385fd3b 100644
--- a/android/test/plugins/testPlugins.iml
+++ b/android/test/plugins/testPlugins.iml
@@ -23,6 +23,9 @@
       <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/tmp" />
     </content>
     <content url="file://$MODULE_DIR$/../../../java/test/plugins/src/main/java">
       <sourceFolder url="file://$MODULE_DIR$/../../../java/test/plugins/src/main/java" isTestSource="false" />
diff --git a/android/test/test.iml b/android/test/test.iml
index 76f996b06be..790e5061a02 100644
--- a/android/test/test.iml
+++ b/android/test/test.iml
@@ -23,6 +23,17 @@
       <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/libs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/set1.d.xml" />
+      <excludeFolder url="file://$MODULE_DIR$/build/set2.d.xml" />
+      <excludeFolder url="file://$MODULE_DIR$/build/set3.d.xml" />
+      <excludeFolder url="file://$MODULE_DIR$/build/set4.d.xml" />
+      <excludeFolder url="file://$MODULE_DIR$/build/set5.d.xml" />
+      <excludeFolder url="file://$MODULE_DIR$/build/set6.d.xml" />
+      <excludeFolder url="file://$MODULE_DIR$/build/slice2freezej.df.xml" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <content url="file://$MODULE_DIR$/../../java/test/src/main/java">
       <sourceFolder url="file://$MODULE_DIR$/../../java/test/src/main/java" isTestSource="false" />
-- 
cgit v1.2.3