Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
057d3e7a
Commit
057d3e7a
authored
Jan 04, 2019
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
parent
86ead133
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
13 additions
and
0 deletions
+13
-0
QGCExternalLibs.pri
QGCExternalLibs.pri
+10
-0
AndroidManifest.xml
android/AndroidManifest.xml
+2
-0
README.md
libs/AndroidOpenSSL/README.md
+1
-0
libcrypto.a
libs/AndroidOpenSSL/arch-armeabi-v7a/lib/libcrypto.a
+0
-0
libcrypto.so
libs/AndroidOpenSSL/arch-armeabi-v7a/lib/libcrypto.so
+0
-0
libssl.a
libs/AndroidOpenSSL/arch-armeabi-v7a/lib/libssl.a
+0
-0
libssl.so
libs/AndroidOpenSSL/arch-armeabi-v7a/lib/libssl.so
+0
-0
libcrypto.a
libs/AndroidOpenSSL/arch-x86/lib/libcrypto.a
+0
-0
libcrypto.so
libs/AndroidOpenSSL/arch-x86/lib/libcrypto.so
+0
-0
libssl.a
libs/AndroidOpenSSL/arch-x86/lib/libssl.a
+0
-0
libssl.so
libs/AndroidOpenSSL/arch-x86/lib/libssl.so
+0
-0
No files found.
QGCExternalLibs.pri
View file @
057d3e7a
...
...
@@ -132,6 +132,16 @@ MacBuild {
-lSDL2
}
AndroidBuild {
contains(QT_ARCH, arm) {
ANDROID_EXTRA_LIBS += $$BASEDIR/libs/AndroidOpenSSL/arch-armeabi-v7a/lib/libcrypto.so
ANDROID_EXTRA_LIBS += $$BASEDIR/libs/AndroidOpenSSL/arch-armeabi-v7a/lib/libssl.so
} else {
ANDROID_EXTRA_LIBS += $$BASEDIR/libs/AndroidOpenSSL/arch-x86/lib/libcrypto.so
ANDROID_EXTRA_LIBS += $$BASEDIR/libs/AndroidOpenSSL/arch-x86/lib/libssl.so
}
}
#
# [OPTIONAL] Zeroconf for UDP links
#
...
...
android/AndroidManifest.xml
View file @
057d3e7a
...
...
@@ -68,6 +68,8 @@
<uses-feature
android:name=
"android.hardware.location.network"
android:required=
"false"
/>
<uses-feature
android:name=
"android.hardware.location"
android:required=
"false"
/>
<uses-permission
android:name=
"android.permission.INTERNET"
/>
<!-- The following comment will be replaced upon deployment with default features based on the dependencies of the application.
Remove the comment if you do not require these default features. -->
<!-- %%INSERT_FEATURES -->
...
...
libs/AndroidOpenSSL/README.md
0 → 100644
View file @
057d3e7a
These OpenSLL libraries foir Android are built using the scripts found here: https://github.com/esutton/android-openssl
\ No newline at end of file
libs/AndroidOpenSSL/arch-armeabi-v7a/lib/libcrypto.a
0 → 100644
View file @
057d3e7a
File added
libs/AndroidOpenSSL/arch-armeabi-v7a/lib/libcrypto.so
0 → 100755
View file @
057d3e7a
File added
libs/AndroidOpenSSL/arch-armeabi-v7a/lib/libssl.a
0 → 100644
View file @
057d3e7a
File added
libs/AndroidOpenSSL/arch-armeabi-v7a/lib/libssl.so
0 → 100755
View file @
057d3e7a
File added
libs/AndroidOpenSSL/arch-x86/lib/libcrypto.a
0 → 100644
View file @
057d3e7a
File added
libs/AndroidOpenSSL/arch-x86/lib/libcrypto.so
0 → 100755
View file @
057d3e7a
File added
libs/AndroidOpenSSL/arch-x86/lib/libssl.a
0 → 100644
View file @
057d3e7a
File added
libs/AndroidOpenSSL/arch-x86/lib/libssl.so
0 → 100755
View file @
057d3e7a
File added
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment