jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OpenSSL builds successfully

Browse Source
This commit is contained in:
Pritesh Nandgaonkar
2018-06-13 16:37:15 +01:00
parent a887a87a8d
commit c2b1f09c84
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
android/build.gradle
View File

@@ -134,19 +134,25 @@ task downloadOpenSSL(dependsOn: [], type: Download) {
task prepareOpenSSL(dependsOn: [downloadOpenSSL], type: Copy) { task prepareOpenSSL(dependsOn: [downloadOpenSSL], type: Copy) {
from tarTree(downloadOpenSSL.dest) from tarTree(downloadOpenSSL.dest)
from './third-party/OpenSSL/' include 'openssl-android-1.0.0/**/*'
include 'openssl-android-1.0.0/**/*', 'build.gradle', 'ApplicationManifest.xml'
includeEmptyDirs = false includeEmptyDirs = false
into "$thirdPartyNdkDir/OpenSSL/" into "$thirdPartyNdkDir/OpenSSL/"
} }
task finalizeOpenSSL(dependsOn: [prepareOpenSSL], type: Copy) {
from './third-party/OpenSSL/'
include 'build.gradle', 'ApplicationManifest.xml'
includeEmptyDirs = false
into "$thirdPartyNdkDir/OpenSSL/openssl-android-1.0.0/"
}
task prepareAllLibs() { task prepareAllLibs() {
dependsOn finalizeGlog dependsOn finalizeGlog
dependsOn prepareDoubleConversion dependsOn prepareDoubleConversion
dependsOn prepareBoost dependsOn prepareBoost
dependsOn prepareFolly dependsOn prepareFolly
dependsOn finalizeEvent dependsOn finalizeEvent
dependsOn prepareOpenSSL dependsOn finalizeOpenSSL
} }
android { android {

8
android/third-party/OpenSSL/build.gradle vendored
View File

@@ -8,15 +8,14 @@ android {
minSdkVersion rootProject.minSdkVersion minSdkVersion rootProject.minSdkVersion
targetSdkVersion rootProject.targetSdkVersion targetSdkVersion rootProject.targetSdkVersion
ndk { ndk {
abiFilters 'x86', 'armeabi-v7a', 'arm64-v8a' 'x86_64' abiFilters 'x86', 'arm64-v8a'
} }
externalNativeBuild { externalNativeBuild {
ndkBuild { ndkBuild {
arguments "NDK_APPLICATION_MK:=$projectDir/jni/Application.mk", arguments "NDK_APPLICATION_MK:=$projectDir/jni/Application.mk",
"NDK_TOOLCHAIN_VERSION:=clang", "NDK_TOOLCHAIN_VERSION:=clang"
"NDK_PROJECT_PATH:=openssl-android-1.0.0" cppFlags "-std=c++11"
cppFlags "-fPIC"
} }
} }
} }
@@ -34,4 +33,3 @@ android {
} }
} }
} }
#abiFilters 'x86', 'arm64-v8a', 'x86_64'