ETM-Schurig
/
nymea-app
mirror of https://github.com/nymea/nymea-app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge PR #203: Use KDAB's openssl builds

pull/204/head
Jenkins 2019-06-13 01:42:27 +02:00
parent 53255d391a fbc2876a60
commit 6c53bd1f9b
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@ -4,3 +4,7 @@
[submodule "nymea-remoteproxy"]
path = nymea-remoteproxy
url = https://github.com/guh/nymea-remoteproxy.git
[submodule "android_openssl"]
path = android_openssl
url = https://github.com/KDAB/android_openssl.git
branch = 1.0.x

1
android_openssl Submodule

@ -0,0 +1 @@
Subproject commit edc0a6fb19821d59f13087cf38c9a56932798b57

8
nymea-app/nymea-app.pro
View File

@ -54,6 +54,8 @@ android {
FIREBASE_STL_VARIANT = gnustl
}
include(../android_openssl/openssl.pri)
INCLUDEPATH += /opt/firebase_cpp_sdk/include
LIBS += -L/opt/firebase_cpp_sdk/libs/android/$$ANDROID_TARGET_ARCH/$$FIREBASE_STL_VARIANT/ -lfirebase_messaging -lfirebase_app
@ -74,12 +76,6 @@ android {
$$ANDROID_PACKAGE_SOURCE_DIR/src/io/guh/nymeaapp/NymeaAppNotificationService.java \
$$ANDROID_PACKAGE_SOURCE_DIR/LICENSE
# Build this in /opt/ to build android SSL libs (known to work with android-ndk-r18b)
# https://github.com/akontsevich/openssl-android-build
ANDROID_EXTRA_LIBS = \
/opt/openssl-android-build/libs/android/$$ANDROID_TARGET_ARCH/libcrypto.so \
/opt/openssl-android-build/libs/android/$$ANDROID_TARGET_ARCH/libssl.so \
}
macx: {