diff options
| author | BogDan Vatra <bogdan@kde.org> | 2019-07-06 12:36:50 +0300 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2019-07-26 14:35:16 +0000 |
| commit | 4ef5512d625f2ee5198f08645482bd42d90e47f2 (patch) | |
| tree | f69244f61b0d407009df6ff772e384579ac470f8 | |
| parent | 2eb2e153f0f7b9c3112c269f87c0faf37df97edb (diff) | |
| download | qtdoc-4ef5512d625f2ee5198f08645482bd42d90e47f2.tar.gz | |
Android: Update OpenSSL 1.1 docs
Task-number: QTBUG-76884
Change-Id: I3fe3fe66c05919fa2e3a3f4961cfa052e9e5408b
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| -rw-r--r-- | doc/src/platforms/android.qdoc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/doc/src/platforms/android.qdoc b/doc/src/platforms/android.qdoc index 1bad1291..20c4961e 100644 --- a/doc/src/platforms/android.qdoc +++ b/doc/src/platforms/android.qdoc @@ -341,8 +341,13 @@ the APK: See the \l{OpenSSL Configure Options}{SSL configure options} for details about the configurable features. - \li Run \c{make CALC_VERSIONS="SHLIB_COMPAT=; SHLIB_SOVER=" build_libs} to - build the \c libcrypto and \c libssl shared libraries that are not versioned. + \li Run \c{make SHLIB_VERSION_NUMBER= SHLIB_EXT=_1_1.so build_libs} to + build \c libcrypto and \c libssl shared libraries that are not versioned, + but with a \e _1_1 suffix. If you want to use a different suffix, then you must + set the \c ANDROID_OPENSSL_SUFFIX environment variable before you access the + Qt Network API. Without a suffix, Android 5 (API 21) will load the system + libraries \e libcrypto.so and \e libssl.so, which are OpenSSL 1.0, rather than + your libraries. \note Android does not load versioned libraries. |