From c17e63263bbd536a67c9d3a44cb83e29d6371097 Mon Sep 17 00:00:00 2001 From: MSoliankoLuxoft Date: Fri, 6 Dec 2024 01:17:51 +0200 Subject: [PATCH 1/2] Add event config for starboard (#4228) (#4456) This PR is a duplicate of PR [4228](https://github.com/youtube/cobalt/pull/4228) added as a cherry-pick to this commit [7bf0af3](https://github.com/youtube/cobalt/commit/7bf0af38b0c97e8ec7b8d572bb9de3727229bf40) b/372056053 --- third_party/libevent/event-config.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/third_party/libevent/event-config.h b/third_party/libevent/event-config.h index 22c4b2e6fbf9..c4ece4041731 100644 --- a/third_party/libevent/event-config.h +++ b/third_party/libevent/event-config.h @@ -5,7 +5,9 @@ // This file is Chromium-specific, and brings in the appropriate // event-config.h depending on your platform. -#if defined(__APPLE__) +#if defined(LIBEVENT_CONFIG_PLATFORM_HEADER) +#include LIBEVENT_CONFIG_PLATFORM_HEADER +#elif defined(__APPLE__) #include "third_party/libevent/mac/event-config.h" #elif defined(ANDROID) #include "third_party/libevent/android/event-config.h" From 9307a5f9b8af36c10764a55f1b873972594a5663 Mon Sep 17 00:00:00 2001 From: Oscar Vestlie Date: Fri, 6 Dec 2024 09:56:19 -0800 Subject: [PATCH 2/2] Add arm64 eg loader config (#4539) b/291130824 --- .github/config/evergreen-arm64.json | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/config/evergreen-arm64.json b/.github/config/evergreen-arm64.json index 0f217ec6d822..a063eca4cd00 100644 --- a/.github/config/evergreen-arm64.json +++ b/.github/config/evergreen-arm64.json @@ -1,5 +1,6 @@ { - "docker_service": "build-evergreen", + "docker_service": "build-android-evergreen", + "evergreen_loader": "android-arm64", "platforms": [ "evergreen-arm64", "evergreen-arm64-sbversion-14", @@ -12,7 +13,8 @@ "platform":"evergreen-arm64", "target_platform":"evergreen-arm64", "target_cpu":"target_cpu=\\\"arm64\\\"", - "extra_gn_arguments":"use_asan=false" + "extra_gn_arguments":"use_asan=false", + "evergreen_loader_extra_gn_arguments": "target_os=\\\"android\\\" sb_is_evergreen_compatible=true" }, { "name":"sbversion-14", @@ -20,7 +22,8 @@ "target_platform":"evergreen-arm64", "target_cpu":"target_cpu=\\\"arm64\\\"", "extra_gn_arguments":"use_asan=false", - "sb_api_version":"14" + "sb_api_version":"14", + "evergreen_loader_extra_gn_arguments": "target_os=\\\"android\\\" sb_is_evergreen_compatible=true" }, { "name":"sbversion-15", @@ -28,7 +31,8 @@ "target_platform":"evergreen-arm64", "target_cpu":"target_cpu=\\\"arm64\\\"", "extra_gn_arguments":"use_asan=false", - "sb_api_version":"15" + "sb_api_version":"15", + "evergreen_loader_extra_gn_arguments": "target_os=\\\"android\\\" sb_is_evergreen_compatible=true" }, { "name":"sbversion-16", @@ -36,7 +40,8 @@ "target_platform":"evergreen-arm64", "target_cpu":"target_cpu=\\\"arm64\\\"", "extra_gn_arguments":"use_asan=false", - "sb_api_version":"16" + "sb_api_version":"16", + "evergreen_loader_extra_gn_arguments": "target_os=\\\"android\\\" sb_is_evergreen_compatible=true" } ] }