commit 34c7cfd2e1b159329d11821598e05f22a3a4e5ae Author: Nathan Freitas nathan@freitas.net Date: Thu Sep 29 12:00:26 2016 -0400

modify jni build inclusion --- app/build.gradle | 3 --- orbotservice/build.gradle | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle index 4b7c1b0..05932ab 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,8 +4,6 @@ android { compileSdkVersion 23 buildToolsVersion "23.0.2"

- sourceSets.main.jni.srcDirs = [] - defaultConfig { applicationId "org.torproject.android" minSdkVersion 9 @@ -22,7 +20,6 @@ android { }

dependencies { - compile project(':jsocksAndroid') compile project(':orbotservice') compile 'com.android.support:support-v4:23.4.0' compile 'com.android.support:appcompat-v7:23.4.0' diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle index 34ddd60..d8296ba 100644 --- a/orbotservice/build.gradle +++ b/orbotservice/build.gradle @@ -4,6 +4,8 @@ android { compileSdkVersion 23 buildToolsVersion "23.0.3"

+ sourceSets.main.jni.srcDirs = [] + defaultConfig { minSdkVersion 9 targetSdkVersion 23 @@ -19,6 +21,7 @@ android { }

dependencies { + compile project(':jsocksAndroid') compile 'com.android.support:appcompat-v7:23.+' compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12'