summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2015-03-18 15:47:28 -0230
committerDwayne Boone <dwayne@zeroc.com>2015-03-18 15:47:28 -0230
commit6acfedd567a22958cdf5f44f2745dcce5b28e6ef (patch)
tree7150d0951cd9227a51aaa1b0b1e077713997e159 /android
parentRemoved demos. (diff)
downloadice-6acfedd567a22958cdf5f44f2745dcce5b28e6ef.tar.bz2
ice-6acfedd567a22958cdf5f44f2745dcce5b28e6ef.tar.xz
ice-6acfedd567a22958cdf5f44f2745dcce5b28e6ef.zip
Removed demo refernces from android build files
Diffstat (limited to 'android')
-rw-r--r--android/.idea/gradle.xml3
-rw-r--r--android/.idea/modules.xml3
-rw-r--r--android/settings.gradle2
3 files changed, 1 insertions, 7 deletions
diff --git a/android/.idea/gradle.xml b/android/.idea/gradle.xml
index ec8cf4be850..390ac149f7f 100644
--- a/android/.idea/gradle.xml
+++ b/android/.idea/gradle.xml
@@ -9,9 +9,6 @@
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
- <option value="$PROJECT_DIR$/demo/chat" />
- <option value="$PROJECT_DIR$/demo/hello" />
- <option value="$PROJECT_DIR$/demo/library" />
<option value="$PROJECT_DIR$/src/Freeze" />
<option value="$PROJECT_DIR$/src/Glacier2" />
<option value="$PROJECT_DIR$/src/Ice" />
diff --git a/android/.idea/modules.xml b/android/.idea/modules.xml
index e065fb69f70..3a4c92974bf 100644
--- a/android/.idea/modules.xml
+++ b/android/.idea/modules.xml
@@ -3,16 +3,13 @@
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/android.iml" filepath="$PROJECT_DIR$/android.iml" />
- <module fileurl="file://$PROJECT_DIR$/demo/chat/chat.iml" filepath="$PROJECT_DIR$/demo/chat/chat.iml" />
<module fileurl="file://$PROJECT_DIR$/src/Freeze/freeze.iml" filepath="$PROJECT_DIR$/src/Freeze/freeze.iml" />
<module fileurl="file://$PROJECT_DIR$/src/Glacier2/glacier2.iml" filepath="$PROJECT_DIR$/src/Glacier2/glacier2.iml" />
- <module fileurl="file://$PROJECT_DIR$/demo/hello/hello.iml" filepath="$PROJECT_DIR$/demo/hello/hello.iml" />
<module fileurl="file://$PROJECT_DIR$/src/Ice/ice.iml" filepath="$PROJECT_DIR$/src/Ice/ice.iml" />
<module fileurl="file://$PROJECT_DIR$/src/IceBox/icebox.iml" filepath="$PROJECT_DIR$/src/IceBox/icebox.iml" />
<module fileurl="file://$PROJECT_DIR$/src/IceGrid/icegrid.iml" filepath="$PROJECT_DIR$/src/IceGrid/icegrid.iml" />
<module fileurl="file://$PROJECT_DIR$/src/IcePatch2/icepatch2.iml" filepath="$PROJECT_DIR$/src/IcePatch2/icepatch2.iml" />
<module fileurl="file://$PROJECT_DIR$/src/IceStorm/icestorm.iml" filepath="$PROJECT_DIR$/src/IceStorm/icestorm.iml" />
- <module fileurl="file://$PROJECT_DIR$/demo/library/library.iml" filepath="$PROJECT_DIR$/demo/library/library.iml" />
<module fileurl="file://$PROJECT_DIR$/test/test.iml" filepath="$PROJECT_DIR$/test/test.iml" />
<module fileurl="file://$PROJECT_DIR$/test/android/testApp.iml" filepath="$PROJECT_DIR$/test/android/testApp.iml" />
<module fileurl="file://$PROJECT_DIR$/test/plugins/testPlugins.iml" filepath="$PROJECT_DIR$/test/plugins/testPlugins.iml" />
diff --git a/android/settings.gradle b/android/settings.gradle
index 12c86e9169a..f4c274fb305 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -30,7 +30,7 @@ project(':icestorm').projectDir = new File('src/IceStorm')
include ':icegrid'
project(':icegrid').projectDir = new File('src/IceGrid')
-include ':hello', ':chat', ':library', ':test', ':testPlugins', ':testApp'
+include ':test', ':testPlugins', ':testApp'
project(':test').projectDir = new File('test')
project(':testPlugins').projectDir = new File('test/plugins')