From be2092af4e6f7649dee37969104f93f68c3945fc Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Mon, 25 Jan 2021 04:37:22 -0300 Subject: 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 Co-authored-by: JackBoosY Co-authored-by: Nicole Mazzuca --- versions/baseline.json | 2 +- versions/m-/mbedtls.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'versions') 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,5 +1,10 @@ { "versions": [ + { + "git-tree": "f1591b930b769b43c14a193282eb85e9a7c51a47", + "version-string": "2.24.0", + "port-version": 2 + }, { "git-tree": "8b510a700284731a6f552ff2cd874794af4032ff", "version-string": "2.24.0", -- cgit v1.2.3