modify jni build inclusion

This commit is contained in:
Nathan Freitas 2016-09-29 12:00:26 -04:00
parent 268002bc75
commit 34c7cfd2e1
2 changed files with 3 additions and 3 deletions

View File

@ -4,8 +4,6 @@ android {
compileSdkVersion 23 compileSdkVersion 23
buildToolsVersion "23.0.2" buildToolsVersion "23.0.2"
sourceSets.main.jni.srcDirs = []
defaultConfig { defaultConfig {
applicationId "org.torproject.android" applicationId "org.torproject.android"
minSdkVersion 9 minSdkVersion 9
@ -22,7 +20,6 @@ android {
} }
dependencies { dependencies {
compile project(':jsocksAndroid')
compile project(':orbotservice') compile project(':orbotservice')
compile 'com.android.support:support-v4:23.4.0' compile 'com.android.support:support-v4:23.4.0'
compile 'com.android.support:appcompat-v7:23.4.0' compile 'com.android.support:appcompat-v7:23.4.0'

View File

@ -4,6 +4,8 @@ android {
compileSdkVersion 23 compileSdkVersion 23
buildToolsVersion "23.0.3" buildToolsVersion "23.0.3"
sourceSets.main.jni.srcDirs = []
defaultConfig { defaultConfig {
minSdkVersion 9 minSdkVersion 9
targetSdkVersion 23 targetSdkVersion 23
@ -19,6 +21,7 @@ android {
} }
dependencies { dependencies {
compile project(':jsocksAndroid')
compile 'com.android.support:appcompat-v7:23.+' compile 'com.android.support:appcompat-v7:23.+'
compile fileTree(dir: 'libs', include: ['*.jar']) compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'