Merge pull request #1103 from hypnosis-i2p/openssl

build.gradle auto-indented; ndk-build is now called by gradle build
This commit is contained in:
orignal 2018-02-08 07:18:39 -05:00 committed by GitHub
commit fb4387c41f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -18,10 +18,6 @@ repositories {
} }
dependencies { dependencies {
// compile "com.android.support:support-v4:26.1.0"
// compile "com.android.support:support-v13:26.1.0"
// compile "com.android.support:cardview-v7:26.1.0"
// compile "com.android.support:appcompat-v7:26.1.0"
compile 'com.android.support:support-v4:25.3.1' compile 'com.android.support:support-v4:25.3.1'
compile 'com.android.support:design:25.3.1' compile 'com.android.support:design:25.3.1'
} }
@ -35,6 +31,9 @@ android {
minSdkVersion 14 minSdkVersion 14
versionCode 1 versionCode 1
versionName "2.18.0" versionName "2.18.0"
ndk {
abiFilters 'armeabi-v7a'
}
} }
sourceSets { sourceSets {
main { main {
@ -59,5 +58,10 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt'
} }
} }
externalNativeBuild {
ndkBuild {
path './jni/Android.mk'
}
}
} }