From 3ad99dadb77e9a51c72edfe997ac19d9cf010b23 Mon Sep 17 00:00:00 2001 From: cobalt-github-releaser-bot <95661244+cobalt-github-releaser-bot@users.noreply.github.com> Date: Mon, 4 Dec 2023 11:29:01 -0800 Subject: [PATCH] Cherry pick PR #2016: Define OPENSSL_NO_ASM for PS5 modular builds (#2038) Refer to the original PR: https://github.com/youtube/cobalt/pull/2016 b/246412559 PS5 modular builds fail to run browser_test without this change , details in b/246412559#comment57 Co-authored-by: Niranjan Yardi --- third_party/boringssl/BUILD.gn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn index 51f71e4f81163..fbc4a85c706d4 100644 --- a/third_party/boringssl/BUILD.gn +++ b/third_party/boringssl/BUILD.gn @@ -1,5 +1,6 @@ import("//starboard/sabi/sabi.gni") import("//third_party/boringssl/buildfiles.gni") +import("//starboard/build/config/os_definitions.gni") declare_args() { asm_target_arch = target_cpu @@ -107,7 +108,7 @@ static_library("crypto") { if ((calling_convention != "aarch64" && calling_convention != "eabi" && calling_convention != "sysv" && calling_convention != "windows") || (asm_target_arch != "x86" && asm_target_arch != "x64" && - asm_target_arch != "arm" && asm_target_arch != "arm64")) { + asm_target_arch != "arm" && asm_target_arch != "arm64") || is_host_win) { # is_host_win : windows host modular builds need OPENSSL_NO_ASM ) defines = [ "OPENSSL_NO_ASM" ] } else { if (calling_convention == "aarch64" || calling_convention == "eabi" ||