diff options
| author | Martin Baulig <mabaul@microsoft.com> | 2019-10-19 01:02:48 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2019-10-19 01:02:48 +0300 |
| commit | fffad7e3a8f57a7eaff67d43a3a29b7f64e94646 (patch) | |
| tree | e9b222b63c2a16a6a6b22cb4b6b8a08c06c2c896 /sdks | |
| parent | 8836231459121e0144ae03169554c1d0636ec5ba (diff) | |
Remove the Legacy TLS Provider. (#17391)
* `MonoTlsProviderFactory` now treats "legacy" as an alias for "default".
* `Mono.Net.Security/LegacySslStream`: Removed. This class also wasn't using the `MobileAuthenticatedStream` base class, thus preventing cleanups simplifications in that area.
* `Mono.Net.Security/LegacyTlsProvider`: Removed.
* `Mono.Security/Mono.Security.Protocol.Tls*`: Removed all the old legacy code.
* `Mono.Security.Interface.MonoTlsProviderFactory`: Bump internal version to 4.
Diffstat (limited to 'sdks')
| -rw-r--r-- | sdks/Make.config.sample | 3 | ||||
| -rw-r--r-- | sdks/README.md | 20 | ||||
| -rw-r--r-- | sdks/android/Makefile | 1 | ||||
| -rw-r--r-- | sdks/android/app/CMakeLists.txt | 1 |
4 files changed, 18 insertions, 7 deletions
diff --git a/sdks/Make.config.sample b/sdks/Make.config.sample index 2c5f9b385df..a9fc1c07c02 100644 --- a/sdks/Make.config.sample +++ b/sdks/Make.config.sample @@ -1,5 +1,8 @@ #This is a sample file of all options that can be used by a Make.config file. +#Enables building Android +ENABLE_ANDROID = 1 + #Disables building Android #DISABLE_ANDROID = 1 diff --git a/sdks/README.md b/sdks/README.md index 9e220f2a30b..f91cabd5e14 100644 --- a/sdks/README.md +++ b/sdks/README.md @@ -34,23 +34,29 @@ Unless you have a very particular need, the BCL build should be left enabled as To build Mono for Android, iOS or WebAssembly, the build scripts can be found in `sdks/builds/`. +For Android, you need to copy `sdks/Make.config.sample` to `sdks/Make.config` and set + +``` +ENABLE_ANDROID = 1 +``` + The `make` targets are as follow: ```bash # Android -mono$ make -C sdks/builds provision-android && make -C sdks/android accept-android-license -mono$ make -C sdks/builds provision-mxe -mono$ make -C sdks/builds archive-android NINJA= IGNORE_PROVISION_ANDROID=1 IGNORE_PROVISION_MXE=1 +make -C sdks/builds provision-android && make -C sdks/android accept-android-license +make -C sdks/builds provision-mxe +make -C sdks/builds archive-android NINJA= IGNORE_PROVISION_ANDROID=1 IGNORE_PROVISION_MXE=1 # iOS -mono$ make -C sdks/builds archive-ios NINJA= +make -C sdks/builds archive-ios NINJA= # WebAssembly -mono$ make -C sdks/builds provision-wasm -mono$ make -C sdks/builds archive-wasm NINJA= +make -C sdks/builds provision-wasm +make -C sdks/builds archive-wasm NINJA= # Mac -mono$ make -C sdks/builds archive-mac [upcoming] +make -C sdks/builds archive-mac [upcoming] ``` # WebAssembly diff --git a/sdks/android/Makefile b/sdks/android/Makefile index d55000b9af6..feef9a1ce6f 100644 --- a/sdks/android/Makefile +++ b/sdks/android/Makefile @@ -74,6 +74,7 @@ app/assets/asm app/src/main/jniLibs/armeabi-v7a app/src/main/jniLibs/arm64-v8a a MONO_LIBS= \ libmonosgen-2.0.so \ libMonoPosixHelper.so \ + libmono-btls-shared.so \ libmono-native.so $(patsubst %,app/src/main/jniLibs/armeabi-v7a/%,$(MONO_LIBS)): app/src/main/jniLibs/armeabi-v7a/%: $(TOP)/sdks/out/android-armeabi-v7a-$(CONFIGURATION)/lib/% | app/src/main/jniLibs/armeabi-v7a diff --git a/sdks/android/app/CMakeLists.txt b/sdks/android/app/CMakeLists.txt index 52c24c73c1a..84a8926ce4a 100644 --- a/sdks/android/app/CMakeLists.txt +++ b/sdks/android/app/CMakeLists.txt @@ -43,6 +43,7 @@ target_link_libraries( # Specifies the target library. ${CMAKE_CURRENT_SOURCE_DIR}/src/main/jniLibs/${ANDROID_ABI}/libmonosgen-2.0.so ${CMAKE_CURRENT_SOURCE_DIR}/src/main/jniLibs/${ANDROID_ABI}/libMonoPosixHelper.so ${CMAKE_CURRENT_SOURCE_DIR}/src/main/jniLibs/${ANDROID_ABI}/libmono-native.so + ${CMAKE_CURRENT_SOURCE_DIR}/src/main/jniLibs/${ANDROID_ABI}/libmono-btls-shared.so # Links the target library to the log library # included in the NDK. |