From 30b11c3298646db3097be98ef1631b560fe5d00f Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Wed, 8 Feb 2023 11:01:01 -0500 Subject: [PATCH] Stop requiring openssl to bootstrap. (#24901) * Stop requiring openssl to bootstrap. Bootstrap seems to do something with chip_crypto as part ofthe bootstrap process. Have it use the already-available boringssl for that instead of requiring an external openssl. Fixes https://github.com/project-chip/connectedhomeip/issues/24897 * Also fix the no-cipd bootstrap. --- scripts/environment.json | 3 ++- scripts/environment_no_cipd.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/environment.json b/scripts/environment.json index a4bd51be5f2f52..d9dabb8c96affa 100644 --- a/scripts/environment.json +++ b/scripts/environment.json @@ -9,7 +9,8 @@ "gn_root": ".", "gn_targets": [":python_packages.install"], "requirements": ["scripts/requirements.txt"], - "constraints": ["scripts/constraints.txt"] + "constraints": ["scripts/constraints.txt"], + "gn_args": ["chip_crypto=\"boringssl\""] }, "required_submodules": ["third_party/pigweed/repo"], "rosetta": "never", diff --git a/scripts/environment_no_cipd.json b/scripts/environment_no_cipd.json index 8a98fd178afd8f..1e0144898e16b8 100644 --- a/scripts/environment_no_cipd.json +++ b/scripts/environment_no_cipd.json @@ -3,7 +3,8 @@ "gn_root": ".", "gn_targets": [":python_packages.install"], "requirements": ["scripts/requirements.txt"], - "constraints": ["scripts/constraints.txt"] + "constraints": ["scripts/constraints.txt"], + "gn_args": ["chip_crypto=\"boringssl\""] }, "required_submodules": ["third_party/pigweed/repo"], "rosetta": "never",