ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge PR #200: Make it build with arm64

Browse Source
This commit is contained in:
Jenkins 2019-06-12 12:30:33 +02:00
commit c95afe6751
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,10 +54,8 @@ android {
FIREBASE_STL_VARIANT = gnustl FIREBASE_STL_VARIANT = gnustl
} }
message("Using FIREBASE_STL_VARIANT ($$FIREBASE_STL_VARIANT)")
INCLUDEPATH += /opt/firebase_cpp_sdk/include INCLUDEPATH += /opt/firebase_cpp_sdk/include
LIBS += -L/opt/firebase_cpp_sdk/libs/android/armeabi-v7a/$$FIREBASE_STL_VARIANT/ -lfirebase_messaging -lfirebase_app LIBS += -L/opt/firebase_cpp_sdk/libs/android/$$ANDROID_TARGET_ARCH/$$FIREBASE_STL_VARIANT/ -lfirebase_messaging -lfirebase_app
QT += androidextras QT += androidextras
HEADERS += platformintegration/android/platformhelperandroid.h HEADERS += platformintegration/android/platformhelperandroid.h

13
packaging/android/build.gradle
View File

@ -69,17 +69,4 @@ android {
lintOptions { lintOptions {
abortOnError false abortOnError false
} }
/***************************************************************************
* This is a hack to copy the output apk one level up
* old versions of gradle have put it to build/apks/android-build-debug.apk
* new versions put it to build/apks/debug/android-build-debug.apk
* which breaks qtcreator deployment
* Remote this when QtCreator is updated to support new gradle
**************************************************************************/
applicationVariants.all { variant ->
variant.outputs.all {
outputFileName = "../" + outputFileName
}
}
} }