From 20d2e12446a6e9adf84d980ffd1dca0b76318ac9 Mon Sep 17 00:00:00 2001 From: Oscar Vestlie Date: Tue, 13 Aug 2024 00:35:56 +0200 Subject: [PATCH] Add AOSP to Evergreen arm64 configuration (#3290) 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 eb7f5bbd3272..981f77a45a68 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-15", @@ -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-15", @@ -20,7 +22,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", @@ -28,7 +31,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" }, { "name":"sbversion-17", @@ -36,7 +40,8 @@ "target_platform":"evergreen-arm64", "target_cpu":"target_cpu=\\\"arm64\\\"", "extra_gn_arguments":"use_asan=false", - "sb_api_version":"17" + "sb_api_version":"17", + "evergreen_loader_extra_gn_arguments": "target_os=\\\"android\\\" sb_is_evergreen_compatible=true" } ] }