Merge branch '25.lts.1+' into destroy_fileproxy_first

youtube · Dec 11, 2024 · fae1b9b · fae1b9b
2 parents 318a771 + 9307a5f
commit fae1b9b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git 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,31 +13,35 @@
       "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",
       "platform":"evergreen-arm64-sbversion-14",
       "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",
       "platform":"evergreen-arm64-sbversion-15",
       "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",
       "platform":"evergreen-arm64-sbversion-16",
       "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"
     }
   ]
 }
diff --git 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"