diff --git a/openpgpsdk/src/openpgpsdk.pro b/openpgpsdk/src/openpgpsdk.pro index fccf9e382..eaf4ef2e6 100644 --- a/openpgpsdk/src/openpgpsdk.pro +++ b/openpgpsdk/src/openpgpsdk.pro @@ -124,8 +124,8 @@ SOURCES += openpgpsdk/opsstring.c android-* { -## Add this here and not in retroshare.pri because static library are very -## sensible to order in command line +## Add this here because static library are very sensible to order in +## command line LIBS += -L$$NATIVE_LIBS_TOOLCHAIN_PATH/sysroot/usr/lib/ -lssl INCLUDEPATH += $$NATIVE_LIBS_TOOLCHAIN_PATH/sysroot/usr/include DEPENDPATH += $$NATIVE_LIBS_TOOLCHAIN_PATH/sysroot/usr/include @@ -135,5 +135,4 @@ android-* { INCLUDEPATH += $$NATIVE_LIBS_TOOLCHAIN_PATH/sysroot/usr/include DEPENDPATH += $$NATIVE_LIBS_TOOLCHAIN_PATH/sysroot/usr/include PRE_TARGETDEPS += $$NATIVE_LIBS_TOOLCHAIN_PATH/sysroot/usr/lib/libcrypto.a - } diff --git a/retroshare-qml-app/src/retroshare-qml-app.pro b/retroshare-qml-app/src/retroshare-qml-app.pro index fe6513b9b..15054102c 100644 --- a/retroshare-qml-app/src/retroshare-qml-app.pro +++ b/retroshare-qml-app/src/retroshare-qml-app.pro @@ -21,7 +21,26 @@ android-* { QT += androidextras HEADERS += NativeCalls.h androidplatforminteracions.h SOURCES += NativeCalls.cpp androidplatforminteracions.cpp + + ANDROID_EXTRA_LIBS *= $$NATIVE_LIBS_TOOLCHAIN_PATH/sysroot/usr/lib/libsqlite3.so + ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android + + + # Default rules for deployment. + include(deployment.pri) + + DISTFILES += \ + android/AndroidManifest.xml \ + android/gradle/wrapper/gradle-wrapper.jar \ + android/gradlew \ + android/res/values/libs.xml \ + android/build.gradle \ + android/gradle/wrapper/gradle-wrapper.properties \ + android/gradlew.bat \ + icons/retroshare.png + } else { + HEADERS += defaultplatforminteracions.h SOURCES += defaultplatforminteracions.cpp } @@ -29,24 +48,3 @@ android-* { # Additional import path used to resolve QML modules in Qt Creator's code model #QML_IMPORT_PATH = #QML2_IMPORT_PATH = - - -# Default rules for deployment. -include(deployment.pri) - -DISTFILES += \ - android/AndroidManifest.xml \ - android/gradle/wrapper/gradle-wrapper.jar \ - android/gradlew \ - android/res/values/libs.xml \ - android/build.gradle \ - android/gradle/wrapper/gradle-wrapper.properties \ - android/gradlew.bat \ - icons/retroshare.png - -ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android - -DEPENDPATH *= ../../libretroshare/src -INCLUDEPATH *= ../../libretroshare/src -PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a -LIBS *= ../../libretroshare/src/lib/libretroshare.a