am 6ccd708a: am 0e406003: Merge "Fix crash/OOM in DiskBasedCache"
* commit '6ccd708adf345337137a7ef8efa6fd618afa7bc4':
Fix crash/OOM in DiskBasedCache
diff --git a/build.gradle b/build.gradle
index 81826bd..24a5710 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.8.+'
+ classpath 'com.android.tools.build:gradle:0.11.+'
}
}
@@ -11,25 +11,7 @@
android {
compileSdkVersion 19
- buildToolsVersion = 19
-
- sourceSets {
- defaultConfig {
- testPackageName 'com.android.volley.tests'
- }
-
- main {
- assets.srcDirs = ['assets']
- res.srcDirs = ['res']
- aidl.srcDirs = ['src']
- resources.srcDirs = ['src']
- renderscript.srcDirs = ['src']
- java.srcDirs = ['src']
- manifest.srcFile 'AndroidManifest.xml'
-
- }
-
- instrumentTest.setRoot('tests')
- instrumentTest.java.srcDirs = ['tests/src']
- }
+ buildToolsVersion = '19.1.0'
}
+
+apply from: 'rules.gradle'
diff --git a/rules.gradle b/rules.gradle
new file mode 100644
index 0000000..73d8a4c
--- /dev/null
+++ b/rules.gradle
@@ -0,0 +1,27 @@
+apply plugin: 'android-library'
+
+android {
+ sourceSets {
+ defaultConfig {
+ testPackageName 'com.android.volley.tests'
+ }
+
+ main {
+ assets.srcDirs = ['assets']
+ res.srcDirs = ['res']
+ aidl.srcDirs = ['src']
+ resources.srcDirs = ['src']
+ renderscript.srcDirs = ['src']
+ java.srcDirs = ['src']
+ manifest.srcFile 'AndroidManifest.xml'
+
+ }
+
+ androidTest.setRoot('tests')
+ androidTest.java.srcDirs = ['tests/src']
+ }
+ lintOptions {
+ // TODO: fix errors and reenable.
+ abortOnError false
+ }
+}
