Fixes for android studio 1.0.

8 files changed, 172 insertions, 23 deletions

diff --git a/android/test/android/build.gradle b/android/test/android/build.gradle
index 1b0c1e07968..73658804053 100644
--- a/android/test/android/build.gradle
+++ b/android/test/android/build.gradle
@@ -27,12 +27,12 @@ android {
 
     buildTypes {
         debug {
-            runProguard false
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard.cfg'
         }
 
         release {
-            runProguard false
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard.cfg'
         }
     }
diff --git a/android/test/android/src/main/res/raw/client.bks b/android/test/android/src/main/res/raw/client.bks
new file mode 100644
index 00000000000..b1f4d3f0a6a
--- /dev/null
+++ b/android/test/android/src/main/res/raw/client.bks
diff --git a/android/test/android/src/main/res/raw/server.bks b/android/test/android/src/main/res/raw/server.bks
new file mode 100644
index 00000000000..276f19e74a6
--- /dev/null
+++ b/android/test/android/src/main/res/raw/server.bks
diff --git a/android/test/android/testApp.iml b/android/test/android/testApp.iml
index 4a27553dc0e..299ec77ac2d 100644
--- a/android/test/android/testApp.iml
+++ b/android/test/android/testApp.iml
@@ -31,11 +31,13 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
diff --git a/android/test/build.gradle.xxx b/android/test/build.gradle.xxx
new file mode 100644
index 00000000000..f43de062ad5
--- /dev/null
+++ b/android/test/build.gradle.xxx
@@ -0,0 +1,122 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2014 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"
+
+ext.testDir = "$rootProject.projectDir/../java/test/src/main/java/test"
+apply from: "$rootProject.projectDir/../java/test/slice.gradle"
+
+import org.apache.tools.ant.taskdefs.condition.Os
+
+sourceSets {
+    main {
+        java {
+            srcDir "$rootProject.projectDir/../java/test/src/main/java"
+            include 'test/Util/**'
+            include 'test/Ice/**'
+            exclude 'test/Ice/**/lambda'
+            exclude 'test/Ice/plugin/plugins'
+            exclude 'test/Ice/faultTolerance'
+            exclude 'test/Ice/hash'
+            exclude 'test/Ice/metrics'
+            exclude 'test/Ice/properties'
+            exclude 'test/Ice/threadPoolPriority'
+            exclude 'test/Ice/throughput'
+        }
+    }
+}
+
+// Discover the Android SDK home.
+// It either comes from the environment or from sdk.dir defined
+// in local.properties at the root of the android project.
+def androidSdkDir = System.env.ANDROID_HOME
+if(androidSdkDir == null) {
+    Properties localProps = new Properties()
+    localProps.load(new FileInputStream(file("$rootProject.projectDir/local.properties")))
+    androidSdkDir = localProps['sdk.dir']
+}
+
+tests = [ "acm",
+          "adapterDeactivation",
+          "admin",
+          "ami",
+          "background",
+          "binding",
+          "checksum",
+          "classLoader",
+          "custom",
+          "defaultServant",
+          "defaultValue",
+          "dispatcher",
+          "echo",
+          "enums",
+          "exceptions",
+          "facets",
+          "faultTolerance",
+          "hash",
+          "hold",
+          "info",
+          "inheritance",
+          "interceptor",
+          "interrupt",
+          "invoke",
+          "location",
+          "networkProxy",
+          "objects",
+          "operations",
+          "optional",
+          "packagemd",
+          "plugin",
+          "proxy",
+          "retry",
+          "seqMapping",
+          "serialize",
+          "servantLocator",
+          "slicing",
+          "stream",
+          "timeout",
+          "udp" ]
+
+tests.each {
+    def testName = it
+    def taskName = "dexClasses_${testName}"
+    def dexName = "IceTest_${testName}.dex"
+    task "${taskName}"(dependsOn: 'classes') << {
+        String cmdExt = Os.isFamily(Os.FAMILY_WINDOWS) ? '.bat' : ''
+       exec {
+            commandLine "${androidSdkDir}/build-tools/${ice_buildToolsVersion}/dx${cmdExt}", '--dex',
+                    "--output=${buildDir}/classes/main/${dexName}",
+                    "${buildDir}/classes/main/test/Ice/${testName}"
+        }
+    }
+    // The jar file should only include IceTestPlugins.dex
+    configure(jar) {
+        include "${dexName}"
+    }
+    jar.dependsOn("${taskName}")
+}
+
+idea.module {
+    excludeDirs -= file(buildDir)
+    buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it }
+}
+
+dependencies {
+    compile project(':Ice')
+}
+
+jar {
+    archiveName = "IceTest.jar"
+    destinationDir = new File("$rootProject.projectDir/lib/")
+}
+
+clean {
+    delete("$rootProject.projectDir/lib/IceTest.jar")
+}
diff --git a/android/test/plugins/testPlugins.iml b/android/test/plugins/testPlugins.iml
index ab5f5ce27ad..dbb8f1fdefc 100644
--- a/android/test/plugins/testPlugins.iml
+++ b/android/test/plugins/testPlugins.iml
@@ -17,16 +17,12 @@
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated-src" isTestSource="false" />
+      <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" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <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/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/libs" />
-      <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/src/test_Ice_acm/test_Ice_acm.iml b/android/test/src/test_Ice_acm/test_Ice_acm.iml
new file mode 100644
index 00000000000..ff80e382132
--- /dev/null
+++ b/android/test/src/test_Ice_acm/test_Ice_acm.iml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":test_Ice_acm" />
+      </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$/../../build/generated-src">
+      <sourceFolder url="file://$MODULE_DIR$/../../build/generated-src" isTestSource="false" />
+    </content>
+    <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" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../../java/test/src/main/java">
+      <sourceFolder url="file://$MODULE_DIR$/../../../../java/test/src/main/java" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="test" exported="" />
+    <orderEntry type="module" module-name="ice" exported="" />
+  </component>
+</module>
+
diff --git a/android/test/test.iml b/android/test/test.iml
index 4287a86a180..76f996b06be 100644
--- a/android/test/test.iml
+++ b/android/test/test.iml
@@ -17,23 +17,12 @@
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated-src" isTestSource="false" />
+      <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" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <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/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" />