Changes to get android builds to work properly from demo distribution

Support for local only builds for java demos
Support for install of gradle slice builder plugin

2 files changed, 26 insertions, 2 deletions

diff --git a/android/build.gradle b/android/build.gradle
index 93cf317706c..a296f5d504f 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -21,6 +21,7 @@ subprojects {
     project.group = "com.zeroc"
 
     apply plugin: 'idea'
+    apply from: "$rootProject.projectDir/gradle/props.gradle"
 
     // The Android versions used by subprojects.
     ext.ice_compileSdkVersion = 17
@@ -29,8 +30,20 @@ subprojects {
     ext.ice_targetSdkVersion = 17
 
     repositories {
-        maven {
-            url 'http://repo.zeroc.com/nexus/content/repositories/thirdparty'
+        if (distJarDir != null) {
+            flatDir {
+                name "local"
+                dirs distJarDir
+            }
+        }
+
+        if (!useLocalOnly) {
+            maven {
+                url 'http://repo.zeroc.com/nexus/content/repositories/thirdparty'
+            }
+            maven {
+                url 'http://repo.zeroc.com/nexus/content/repositories/releases'
+            }
         }
     }
 }
diff --git a/android/gradle/props.gradle b/android/gradle/props.gradle
new file mode 100644
index 00000000000..40ae5214a92
--- /dev/null
+++ b/android/gradle/props.gradle
@@ -0,0 +1,11 @@
+// **********************************************************************
+//
+// 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.
+//
+// **********************************************************************
+
+ext.useLocalOnly = false
+ext.distJarDir = null