Merge PR #576: Fix firebase path

This commit is contained in:
Jenkins nymea 2021-03-29 13:01:46 +02:00
commit 3f95c484ff
3 changed files with 3 additions and 3 deletions

View File

@ -21,8 +21,6 @@ linux:!android {
android: {
QMAKE_CXXFLAGS += -Wno-deprecated-declarations
QMAKE_POST_LINK += $$QMAKE_COPY $$shell_path($$top_srcdir/version.txt) $$shell_path($$top_builddir/)
!equals(OVERLAY_PATH, ""):!equals(BRANDING, "") {
ANDROID_PACKAGE_SOURCE_DIR = $${OVERLAY_PATH}/packaging/android_$$BRANDING
} else {

View File

@ -66,6 +66,8 @@ android {
LIBS += -L$${top_builddir}/libnymea-app/$${ANDROID_TARGET_ARCH}
PRE_TARGETDEPS += $$top_builddir/libnymea-app/$${ANDROID_TARGET_ARCH}/libnymea-app.a
QMAKE_POST_LINK += $$QMAKE_COPY $$shell_path($$top_srcdir/version.txt) $$shell_path($$top_builddir/)
DISTFILES += \
$$ANDROID_PACKAGE_SOURCE_DIR/AndroidManifest.xml \
$$ANDROID_PACKAGE_SOURCE_DIR/google-services.json \

View File

@ -28,7 +28,7 @@ allprojects {
url "https://maven.google.com"
}
flatDir {
dirs "/opt/firebase_cpp_sdk/libs/android"
dirs nymeaAppRoot + "/3rdParty/android/firebase_cpp_sdk/libs/android/"
}
}
}