Android tests & demos now copy the bks files from the certs dir.

11 files changed, 43 insertions, 0 deletions

diff --git a/android/demo/chat/build.gradle b/android/demo/chat/build.gradle
index 24efbb7308b..65bad85d1bd 100644
--- a/android/demo/chat/build.gradle
+++ b/android/demo/chat/build.gradle
@@ -50,6 +50,16 @@ android {
     }
 }
 
+task copyBksTask(type: Copy) {
+    from "${rootProject.projectDir}/../certs/client.bks"
+    into "src/main/res/raw"
+}
+preBuild.dependsOn(copyBksTask)
+
+clean {
+    delete("src/main/res/raw/client.bks")
+}
+
 idea.module {
     excludeDirs -= file(buildDir)
     buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it }
diff --git a/android/demo/chat/src/main/res/raw/.gitignore b/android/demo/chat/src/main/res/raw/.gitignore
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/android/demo/chat/src/main/res/raw/.gitignore
diff --git a/android/demo/chat/src/main/res/raw/client.bks b/android/demo/chat/src/main/res/raw/client.bks
deleted file mode 100644
index b1f4d3f0a6a..00000000000
--- a/android/demo/chat/src/main/res/raw/client.bks
+++ /dev/null
diff --git a/android/demo/hello/build.gradle b/android/demo/hello/build.gradle
index e7cd99241e8..da4999cf133 100644
--- a/android/demo/hello/build.gradle
+++ b/android/demo/hello/build.gradle
@@ -49,6 +49,16 @@ android {
     }
 }
 
+task copyBksTask(type: Copy) {
+    from "${rootProject.projectDir}/../certs/client.bks"
+    into "src/main/res/raw"
+}
+preBuild.dependsOn(copyBksTask)
+
+clean {
+    delete("src/main/res/raw/client.bks")
+}
+
 idea.module {
     excludeDirs -= file(buildDir)
     buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it }
@@ -57,3 +67,4 @@ idea.module {
 dependencies {
     compile localDependency('ice')
 }
+
diff --git a/android/demo/hello/src/main/res/raw/client.bks b/android/demo/hello/src/main/res/raw/client.bks
deleted file mode 100644
index b1f4d3f0a6a..00000000000
--- a/android/demo/hello/src/main/res/raw/client.bks
+++ /dev/null
diff --git a/android/demo/library/build.gradle b/android/demo/library/build.gradle
index e095f2ca73e..038c55caf8a 100644
--- a/android/demo/library/build.gradle
+++ b/android/demo/library/build.gradle
@@ -50,6 +50,16 @@ android {
     }
 }
 
+task copyBksTask(type: Copy) {
+    from "${rootProject.projectDir}/../certs/client.bks"
+    into "src/main/res/raw"
+}
+preBuild.dependsOn(copyBksTask)
+
+clean {
+    delete("src/main/res/raw/client.bks")
+}
+
 idea.module {
     excludeDirs -= file(buildDir)
     buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it }
diff --git a/android/demo/library/src/main/res/raw/.gitignore b/android/demo/library/src/main/res/raw/.gitignore
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/android/demo/library/src/main/res/raw/.gitignore
diff --git a/android/demo/library/src/main/res/raw/client.bks b/android/demo/library/src/main/res/raw/client.bks
deleted file mode 100644
index b1f4d3f0a6a..00000000000
--- a/android/demo/library/src/main/res/raw/client.bks
+++ /dev/null
diff --git a/android/test/android/build.gradle b/android/test/android/build.gradle
index 9d9168f6f21..6d939cbac67 100644
--- a/android/test/android/build.gradle
+++ b/android/test/android/build.gradle
@@ -76,6 +76,18 @@ tests.each {
     }
 }
 
+task copyBksTask(type: Copy) {
+    from "${rootProject.projectDir}/../certs/client.bks"
+    from "${rootProject.projectDir}/../certs/server.bks"
+    into "src/main/res/raw"
+}
+preBuild.dependsOn(copyBksTask)
+
+clean {
+    delete("src/main/res/raw/client.bks")
+    delete("src/main/res/raw/server.bks")
+}
+
 dependencies {
     compile localDependency('ice')
     compile project(':test')
diff --git a/android/test/android/src/main/res/raw/client.bks b/android/test/android/src/main/res/raw/client.bks
deleted file mode 100644
index b1f4d3f0a6a..00000000000
--- a/android/test/android/src/main/res/raw/client.bks
+++ /dev/null
diff --git a/android/test/android/src/main/res/raw/server.bks b/android/test/android/src/main/res/raw/server.bks
deleted file mode 100644
index 276f19e74a6..00000000000
--- a/android/test/android/src/main/res/raw/server.bks
+++ /dev/null