diff options
| author | Ahmed Yarub Hani Al Nuaimi <ahmedyarub@yahoo.com> | 2021-01-25 04:37:22 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-24 23:37:22 -0800 |
| commit | be2092af4e6f7649dee37969104f93f68c3945fc (patch) | |
| tree | 862c7075b509c465f4d29dc59250dcda90db66f8 /versions | |
| parent | e263d00933414bb1cd84be4bd6e4f43c4bc03ce9 (diff) | |
| download | vcpkg-be2092af4e6f7649dee37969104f93f68c3945fc.tar.gz vcpkg-be2092af4e6f7649dee37969104f93f68c3945fc.zip | |
Fix Mbed TLS build for Android (#15680)
* Fix Mbed TLS build for Android
* Fix Mbed TLS build for Android
Add better Windows checks
* Fix libssh build for Android
* update baseline
* Remove redundant parameter
* Fix version
* Fix version
* Fix paramters
* Fix version
* Better Android support
* Fix version
* Disable warnings as errors for Mbed TLS
* Restore formatting
* Fix version files
Co-authored-by: Ahmed Yarub Hani Al Nuaimi <ahmed.alnuaimi@zwift.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
Diffstat (limited to 'versions')
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/m-/mbedtls.json | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/versions/baseline.json b/versions/baseline.json index 7565cc7ba..a06db4fb0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3658,7 +3658,7 @@ }, "mbedtls": { "baseline": "2.24.0", - "port-version": 1 + "port-version": 2 }, "mcpp": { "baseline": "2.7.2.14", diff --git a/versions/m-/mbedtls.json b/versions/m-/mbedtls.json index 4eb92bc59..6498c4d2c 100644 --- a/versions/m-/mbedtls.json +++ b/versions/m-/mbedtls.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "f1591b930b769b43c14a193282eb85e9a7c51a47", + "version-string": "2.24.0", + "port-version": 2 + }, + { "git-tree": "8b510a700284731a6f552ff2cd874794af4032ff", "version-string": "2.24.0", "port-version": 1 |