- Fixed arrayOffset bug with IceSSL.TransceiverI.fill.

- Added WS/WSS to android test suite.
- Fixed bks files for android.

8 files changed, 38 insertions, 21 deletions

diff --git a/android/src/Freeze/freeze.iml b/android/src/Freeze/freeze.iml
new file mode 100644
index 00000000000..22667efcc7e
--- /dev/null
+++ b/android/src/Freeze/freeze.iml
@@ -0,0 +1,16 @@
+<?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.6b" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":freeze" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+
diff --git a/android/src/Glacier2/Glacier2.iml b/android/src/Glacier2/glacier2.iml
index 6b6691c8110..42c077f2345 100644
--- a/android/src/Glacier2/Glacier2.iml
+++ b/android/src/Glacier2/glacier2.iml
@@ -1,9 +1,9 @@
 <?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="android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<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.6b" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":Glacier2" />
+        <option name="GRADLE_PROJECT_PATH" value=":glacier2" />
       </configuration>
     </facet>
     <facet type="java-gradle" name="Java-Gradle">
@@ -33,7 +33,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="Ice" exported="" />
+    <orderEntry type="module" module-name="ice" exported="" />
   </component>
 </module>
 
diff --git a/android/src/Ice/Ice.iml b/android/src/Ice/ice.iml
index f67164fd389..6930a46aff4 100644
--- a/android/src/Ice/Ice.iml
+++ b/android/src/Ice/ice.iml
@@ -1,9 +1,9 @@
 <?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="android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<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.6b" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":Ice" />
+        <option name="GRADLE_PROJECT_PATH" value=":ice" />
       </configuration>
     </facet>
     <facet type="java-gradle" name="Java-Gradle">
diff --git a/android/src/IceBox/IceBox.iml b/android/src/IceBox/icebox.iml
index 7da3c706634..2ef993257c2 100644
--- a/android/src/IceBox/IceBox.iml
+++ b/android/src/IceBox/icebox.iml
@@ -1,9 +1,9 @@
 <?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="android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<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.6b" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":IceBox" />
+        <option name="GRADLE_PROJECT_PATH" value=":icebox" />
       </configuration>
     </facet>
     <facet type="java-gradle" name="Java-Gradle">
@@ -33,7 +33,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="Ice" exported="" />
+    <orderEntry type="module" module-name="ice" exported="" />
   </component>
 </module>
 
diff --git a/android/src/IceDiscovery/IceDiscovery.iml b/android/src/IceDiscovery/icediscovery.iml
index 09988761e6f..855cc75aa1d 100644
--- a/android/src/IceDiscovery/IceDiscovery.iml
+++ b/android/src/IceDiscovery/icediscovery.iml
@@ -1,9 +1,9 @@
 <?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="android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<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.6b" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":IceDiscovery" />
+        <option name="GRADLE_PROJECT_PATH" value=":icediscovery" />
       </configuration>
     </facet>
     <facet type="java-gradle" name="Java-Gradle">
@@ -24,6 +24,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/build/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/default.d.xml" />
       <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/set1.d.xml" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
@@ -33,7 +34,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="Ice" exported="" />
+    <orderEntry type="module" module-name="ice" exported="" />
   </component>
 </module>
 
diff --git a/android/src/IceGrid/IceGrid.iml b/android/src/IceGrid/icegrid.iml
index 225424f7823..9c76e036755 100644
--- a/android/src/IceGrid/IceGrid.iml
+++ b/android/src/IceGrid/icegrid.iml
@@ -1,9 +1,9 @@
 <?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="android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<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.6b" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":IceGrid" />
+        <option name="GRADLE_PROJECT_PATH" value=":icegrid" />
       </configuration>
     </facet>
     <facet type="java-gradle" name="Java-Gradle">
@@ -33,8 +33,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="Ice" exported="" />
-    <orderEntry type="module" module-name="Glacier2" exported="" />
+    <orderEntry type="module" module-name="ice" exported="" />
+    <orderEntry type="module" module-name="glacier2" exported="" />
   </component>
 </module>
 
diff --git a/android/src/IcePatch2/IcePatch2.iml b/android/src/IcePatch2/icepatch2.iml
index 5050de6d408..46363f1eb50 100644
--- a/android/src/IcePatch2/IcePatch2.iml
+++ b/android/src/IcePatch2/icepatch2.iml
@@ -1,9 +1,9 @@
 <?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="android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<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.6b" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":IcePatch2" />
+        <option name="GRADLE_PROJECT_PATH" value=":icepatch2" />
       </configuration>
     </facet>
     <facet type="java-gradle" name="Java-Gradle">
@@ -33,7 +33,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="Ice" exported="" />
+    <orderEntry type="module" module-name="ice" exported="" />
   </component>
 </module>
 
diff --git a/android/src/IceStorm/IceStorm.iml b/android/src/IceStorm/icestorm.iml
index 001e66daafd..57c7dc0bf99 100644
--- a/android/src/IceStorm/IceStorm.iml
+++ b/android/src/IceStorm/icestorm.iml
@@ -1,9 +1,9 @@
 <?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="android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<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.6b" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":IceStorm" />
+        <option name="GRADLE_PROJECT_PATH" value=":icestorm" />
       </configuration>
     </facet>
     <facet type="java-gradle" name="Java-Gradle">
@@ -33,7 +33,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="Ice" exported="" />
+    <orderEntry type="module" module-name="ice" exported="" />
   </component>
 </module>