File tree Expand file tree Collapse file tree 4 files changed +12
-22
lines changed Expand file tree Collapse file tree 4 files changed +12
-22
lines changed Original file line number Diff line number Diff line change 9
9
10
10
okhttp
11
11
okio
12
+ libs
Original file line number Diff line number Diff line change 60
60
<excludeFolder url =" file://$MODULE_DIR$/build/outputs" />
61
61
<excludeFolder url =" file://$MODULE_DIR$/build/tmp" />
62
62
</content >
63
- <content url =" file://$MODULE_DIR$/../compat" >
64
- <sourceFolder url =" file://$MODULE_DIR$/../compat" isTestSource =" false" />
65
- </content >
66
- <content url =" file://$MODULE_DIR$/../conscrypt" >
67
- <sourceFolder url =" file://$MODULE_DIR$/../conscrypt" isTestSource =" false" />
68
- </content >
69
63
<orderEntry type =" jdk" jdkName =" Android API 19 Platform" jdkType =" Android SDK" />
70
64
<orderEntry type =" sourceFolder" forTests =" false" />
71
65
</component >
Original file line number Diff line number Diff line change @@ -9,34 +9,29 @@ buildscript {
9
9
apply plugin : ' com.android.library'
10
10
11
11
android {
12
- dependencies {
13
- // compile 'com.squareup.okio:okio:+'
14
- // androidTestCompile 'com.squareup.okhttp:okhttp:1.+'
15
- }
16
-
17
12
sourceSets {
18
13
main {
19
14
manifest. srcFile ' AndroidManifest.xml'
20
15
21
- // jniLibs.srcDirs = ['libs/']
16
+ jniLibs. srcDirs = [' libs/' ]
22
17
23
18
java. srcDirs= [' src/'
24
- // , 'okhttp/'
25
- // , 'okhttp-shim/'
26
- // , '../okio/okio/src/main/java/'
27
- , ' ../conscrypt/'
28
- , ' ../compat/'
29
- // , '../okhttp/okhttp/src/main/java/'
19
+ // , '../conscrypt/'
20
+ // , '../compat/'
30
21
]
31
22
}
32
23
androidTest. java. srcDirs= [' test/src/' ]
33
24
androidTest. res. srcDirs= [' test/res/' ]
34
25
androidTest. assets. srcDirs= [' test/assets/' ]
35
26
}
36
27
37
- compileOptions {
38
- sourceCompatibility JavaVersion . VERSION_1_7
39
- targetCompatibility JavaVersion . VERSION_1_7
28
+ lintOptions {
29
+ abortOnError false
30
+ }
31
+
32
+ defaultConfig {
33
+ minSdkVersion 9
34
+ targetSdkVersion 19
40
35
}
41
36
42
37
compileSdkVersion 19
Original file line number Diff line number Diff line change 11
11
# proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
12
12
13
13
# Project target.
14
- target =android-L
14
+ target =android-19
15
15
android.library =true
16
16
17
17
You can’t perform that action at this time.
0 commit comments