summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.com>2014-06-29 20:15:50 +0200
committerTomaž Vajngerl <tomaz.vajngerl@collabora.com>2014-07-01 09:11:33 +0200
commit0d55277947fbc2f92fb9fe40dcfa804dc619c37a (patch)
treec31b72cd4c9b1a1ed7f7b0f7c39183a464d2194d /android
parent88bd199e761a165b8add0cebac9f149dc4250829 (diff)
LODroid: cleanup
Change-Id: I3c2b156c6ed5c6a27ac845481150150812eef1ec
Diffstat (limited to 'android')
-rw-r--r--android/experimental/LOAndroid2/LOAndroid.iml12
-rw-r--r--android/experimental/LOAndroid2/LOAndroid2.iml7
-rw-r--r--android/experimental/LOAndroid2/build.gradle2
3 files changed, 8 insertions, 13 deletions
diff --git a/android/experimental/LOAndroid2/LOAndroid.iml b/android/experimental/LOAndroid2/LOAndroid.iml
deleted file mode 100644
index cd51bb402236..000000000000
--- a/android/experimental/LOAndroid2/LOAndroid.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <content url="file://$MODULE_DIR$">
- <excludeFolder url="file://$MODULE_DIR$/.gradle" />
- </content>
- <orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
- <orderEntry type="sourceFolder" forTests="false" />
- </component>
-</module>
-
diff --git a/android/experimental/LOAndroid2/LOAndroid2.iml b/android/experimental/LOAndroid2/LOAndroid2.iml
index edb62a65fa47..0bb6048ae08a 100644
--- a/android/experimental/LOAndroid2/LOAndroid2.iml
+++ b/android/experimental/LOAndroid2/LOAndroid2.iml
@@ -1,5 +1,12 @@
<?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="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+ <component name="FacetManager">
+ <facet type="java-gradle" name="Java-Gradle">
+ <configuration>
+ <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+ </configuration>
+ </facet>
+ </component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
diff --git a/android/experimental/LOAndroid2/build.gradle b/android/experimental/LOAndroid2/build.gradle
index 4c8f6d8b90ca..e33f142839c8 100644
--- a/android/experimental/LOAndroid2/build.gradle
+++ b/android/experimental/LOAndroid2/build.gradle
@@ -5,7 +5,7 @@ buildscript {
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.11.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}