diff options
author | Koushik Dutta <koushd@gmail.com> | 2014-07-18 14:28:13 -0700 |
---|---|---|
committer | Koushik Dutta <koushd@gmail.com> | 2014-07-18 14:28:13 -0700 |
commit | 0ef3156bd76047a36d1235fe9bc164f690e55715 (patch) | |
tree | 61a39f3e79b730b8a49ceec2463ddcc59b1cf993 /AndroidAsync | |
parent | 8485b8dd2673f46a69a8f4a7d6174cf5d610bb1f (diff) | |
parent | 5864287147d01d51bf7948fb05f60bc3ad275775 (diff) | |
download | AndroidAsync-0ef3156bd76047a36d1235fe9bc164f690e55715.tar.gz AndroidAsync-0ef3156bd76047a36d1235fe9bc164f690e55715.tar.bz2 AndroidAsync-0ef3156bd76047a36d1235fe9bc164f690e55715.zip |
Merge branch 'master' into spdy
Diffstat (limited to 'AndroidAsync')
-rw-r--r-- | AndroidAsync/AndroidAsync-AndroidAsync.iml | 6 | ||||
-rw-r--r-- | AndroidAsync/build.gradle | 25 |
2 files changed, 10 insertions, 21 deletions
diff --git a/AndroidAsync/AndroidAsync-AndroidAsync.iml b/AndroidAsync/AndroidAsync-AndroidAsync.iml index f88736b..1cdbd09 100644 --- a/AndroidAsync/AndroidAsync-AndroidAsync.iml +++ b/AndroidAsync/AndroidAsync-AndroidAsync.iml @@ -60,12 +60,6 @@ <excludeFolder url="file://$MODULE_DIR$/build/outputs" /> <excludeFolder url="file://$MODULE_DIR$/build/tmp" /> </content> - <content url="file://$MODULE_DIR$/../compat"> - <sourceFolder url="file://$MODULE_DIR$/../compat" isTestSource="false" /> - </content> - <content url="file://$MODULE_DIR$/../conscrypt"> - <sourceFolder url="file://$MODULE_DIR$/../conscrypt" isTestSource="false" /> - </content> <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" /> <orderEntry type="sourceFolder" forTests="false" /> </component> diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle index 908138b..5f19dba 100644 --- a/AndroidAsync/build.gradle +++ b/AndroidAsync/build.gradle @@ -9,24 +9,15 @@ buildscript { apply plugin: 'com.android.library' android { - dependencies { -// compile 'com.squareup.okio:okio:+' -// androidTestCompile 'com.squareup.okhttp:okhttp:1.+' - } - sourceSets { main { manifest.srcFile 'AndroidManifest.xml' -// jniLibs.srcDirs = ['libs/'] + jniLibs.srcDirs = ['libs/'] java.srcDirs=['src/' -// , 'okhttp/' -// , 'okhttp-shim/' -// , '../okio/okio/src/main/java/' - , '../conscrypt/' - , '../compat/' -// , '../okhttp/okhttp/src/main/java/' +// , '../conscrypt/' +// , '../compat/' ] } androidTest.java.srcDirs=['test/src/'] @@ -34,9 +25,13 @@ android { androidTest.assets.srcDirs=['test/assets/'] } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 + lintOptions { + abortOnError false + } + + defaultConfig { + minSdkVersion 9 + targetSdkVersion 19 } lintOptions { |