Change aarch64 FIPS noasm build to be shared instead of static Change-Id: I5f5b9d42128583e457c9ef853cf8011f96c32933 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/71247 Reviewed-by: David Benjamin <davidben@google.com>
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg index f235898..f6c3e85 100644 --- a/generated/commit-queue.cfg +++ b/generated/commit-queue.cfg
@@ -41,6 +41,13 @@ name: "boringssl/try/android_aarch64_fips_compile" } builders { + name: "boringssl/try/android_aarch64_fips_noasm" + includable_only: true + } + builders { + name: "boringssl/try/android_aarch64_fips_noasm_compile" + } + builders { name: "boringssl/try/android_aarch64_fips_static" includable_only: true } @@ -48,13 +55,6 @@ name: "boringssl/try/android_aarch64_fips_static_compile" } builders { - name: "boringssl/try/android_aarch64_fips_static_noasm" - includable_only: true - } - builders { - name: "boringssl/try/android_aarch64_fips_static_noasm_compile" - } - builders { name: "boringssl/try/android_aarch64_rel" includable_only: true }
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg index b344896..9edde23 100644 --- a/generated/cr-buildbucket.cfg +++ b/generated/cr-buildbucket.cfg
@@ -87,7 +87,7 @@ } } builders { - name: "android_aarch64_fips_static" + name: "android_aarch64_fips_noasm" swarming_host: "chromium-swarm.appspot.com" dimensions: "device_type:walleye" dimensions: "pool:luci.flex.ci" @@ -105,7 +105,9 @@ ' "cmake_args": {' ' "ANDROID_ABI": "arm64-v8a",' ' "ANDROID_PLATFORM": "android-21",' - ' "FIPS": "1"' + ' "BUILD_SHARED_LIBS": "1",' + ' "FIPS": "1",' + ' "OPENSSL_NO_ASM": "1"' ' },' ' "recipe": "boringssl"' '}' @@ -125,7 +127,7 @@ } } builders { - name: "android_aarch64_fips_static_noasm" + name: "android_aarch64_fips_static" swarming_host: "chromium-swarm.appspot.com" dimensions: "device_type:walleye" dimensions: "pool:luci.flex.ci" @@ -143,8 +145,7 @@ ' "cmake_args": {' ' "ANDROID_ABI": "arm64-v8a",' ' "ANDROID_PLATFORM": "android-21",' - ' "FIPS": "1",' - ' "OPENSSL_NO_ASM": "1"' + ' "FIPS": "1"' ' },' ' "recipe": "boringssl"' '}' @@ -2316,6 +2317,67 @@ } } builders { + name: "android_aarch64_fips_noasm" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "device_type:walleye" + dimensions: "pool:luci.flex.try" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "luciexe" + } + properties: + '{' + ' "android": true,' + ' "cmake_args": {' + ' "ANDROID_ABI": "arm64-v8a",' + ' "ANDROID_PLATFORM": "android-21",' + ' "BUILD_SHARED_LIBS": "1",' + ' "FIPS": "1",' + ' "OPENSSL_NO_ASM": "1"' + ' },' + ' "recipe": "boringssl"' + '}' + execution_timeout_secs: 3600 + service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } + } + builders { + name: "android_aarch64_fips_noasm_compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "cpu:x86-64" + dimensions: "os:Ubuntu-22.04" + dimensions: "pool:luci.flex.try" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "luciexe" + } + properties: + '{' + ' "android": true,' + ' "cmake_args": {' + ' "ANDROID_ABI": "arm64-v8a",' + ' "ANDROID_PLATFORM": "android-21",' + ' "BUILD_SHARED_LIBS": "1",' + ' "FIPS": "1",' + ' "OPENSSL_NO_ASM": "1"' + ' },' + ' "recipe": "boringssl",' + ' "run_ssl_tests": false,' + ' "run_unit_tests": false' + '}' + execution_timeout_secs: 1800 + service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } + } + builders { name: "android_aarch64_fips_static" swarming_host: "chromium-swarm.appspot.com" dimensions: "device_type:walleye" @@ -2373,65 +2435,6 @@ } } builders { - name: "android_aarch64_fips_static_noasm" - swarming_host: "chromium-swarm.appspot.com" - dimensions: "device_type:walleye" - dimensions: "pool:luci.flex.try" - exe { - cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/main" - cmd: "luciexe" - } - properties: - '{' - ' "android": true,' - ' "cmake_args": {' - ' "ANDROID_ABI": "arm64-v8a",' - ' "ANDROID_PLATFORM": "android-21",' - ' "FIPS": "1",' - ' "OPENSSL_NO_ASM": "1"' - ' },' - ' "recipe": "boringssl"' - '}' - execution_timeout_secs: 3600 - service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" - experiments { - key: "luci.recipes.use_python3" - value: 100 - } - } - builders { - name: "android_aarch64_fips_static_noasm_compile" - swarming_host: "chromium-swarm.appspot.com" - dimensions: "cpu:x86-64" - dimensions: "os:Ubuntu-22.04" - dimensions: "pool:luci.flex.try" - exe { - cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/main" - cmd: "luciexe" - } - properties: - '{' - ' "android": true,' - ' "cmake_args": {' - ' "ANDROID_ABI": "arm64-v8a",' - ' "ANDROID_PLATFORM": "android-21",' - ' "FIPS": "1",' - ' "OPENSSL_NO_ASM": "1"' - ' },' - ' "recipe": "boringssl",' - ' "run_ssl_tests": false,' - ' "run_unit_tests": false' - '}' - execution_timeout_secs: 1800 - service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" - experiments { - key: "luci.recipes.use_python3" - value: 100 - } - } - builders { name: "android_aarch64_rel" swarming_host: "chromium-swarm.appspot.com" dimensions: "device_type:walleye"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg index 9a5f55b..882ed72 100644 --- a/generated/luci-milo.cfg +++ b/generated/luci-milo.cfg
@@ -26,16 +26,16 @@ short_name: "fips" } builders { + name: "buildbucket/luci.boringssl.ci/android_aarch64_fips_noasm" + category: "android|aarch64" + short_name: "fips3" + } + builders { name: "buildbucket/luci.boringssl.ci/android_aarch64_fips_static" category: "android|aarch64" short_name: "fips2" } builders { - name: "buildbucket/luci.boringssl.ci/android_aarch64_fips_static_noasm" - category: "android|aarch64" - short_name: "fips3" - } - builders { name: "buildbucket/luci.boringssl.ci/android_arm" category: "android|thumb" short_name: "dbg"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg index e18e8f2..bc8c40f 100644 --- a/generated/luci-notify.cfg +++ b/generated/luci-notify.cfg
@@ -45,7 +45,7 @@ } builders { bucket: "ci" - name: "android_aarch64_fips_static" + name: "android_aarch64_fips_noasm" repository: "https://boringssl.googlesource.com/boringssl" } } @@ -60,7 +60,7 @@ } builders { bucket: "ci" - name: "android_aarch64_fips_static_noasm" + name: "android_aarch64_fips_static" repository: "https://boringssl.googlesource.com/boringssl" } }
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg index 3d03fb8..e693dc0 100644 --- a/generated/luci-scheduler.cfg +++ b/generated/luci-scheduler.cfg
@@ -25,6 +25,16 @@ } } job { + id: "android_aarch64_fips_noasm" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "ci" + builder: "android_aarch64_fips_noasm" + } +} +job { id: "android_aarch64_fips_static" realm: "ci" acl_sets: "ci" @@ -35,16 +45,6 @@ } } job { - id: "android_aarch64_fips_static_noasm" - realm: "ci" - acl_sets: "ci" - buildbucket { - server: "cr-buildbucket.appspot.com" - bucket: "ci" - builder: "android_aarch64_fips_static_noasm" - } -} -job { id: "android_aarch64_rel" realm: "ci" acl_sets: "ci" @@ -560,8 +560,8 @@ acl_sets: "ci" triggers: "android_aarch64" triggers: "android_aarch64_fips" + triggers: "android_aarch64_fips_noasm" triggers: "android_aarch64_fips_static" - triggers: "android_aarch64_fips_static_noasm" triggers: "android_aarch64_rel" triggers: "android_arm" triggers: "android_arm_armmode_rel"
diff --git a/main.star b/main.star index 3f564ca..fe5e953 100755 --- a/main.star +++ b/main.star
@@ -341,6 +341,27 @@ }, ) +both_builders( + "android_aarch64_fips_noasm", + # The Android FIPS configuration requires a newer device. + WALLEYE_HOST, + category = "android|aarch64", + short_name = "fips3", + cq_compile_only = LINUX_HOST, + properties = { + "android": True, + "cmake_args": { + "OPENSSL_NO_ASM": "1", + "ANDROID_ABI": "arm64-v8a", + "ANDROID_PLATFORM": "android-21", + # FIPS mode on Android uses shared libraries. + "BUILD_SHARED_LIBS": "1", + "FIPS": "1", + }, + }, +) + + # delocate works on aarch64. Test this by also building the static library mode # for android_aarch64_fips. Additionally, urandom_test doesn't work in shared # library builds, so this gives Android FIPS coverage for urandom_test. @@ -362,24 +383,6 @@ ) both_builders( - "android_aarch64_fips_static_noasm", - # The Android FIPS configuration requires a newer device. - WALLEYE_HOST, - category = "android|aarch64", - short_name = "fips3", - cq_compile_only = LINUX_HOST, - properties = { - "android": True, - "cmake_args": { - "OPENSSL_NO_ASM": "1", - "ANDROID_ABI": "arm64-v8a", - "ANDROID_PLATFORM": "android-21", - "FIPS": "1", - }, - }, -) - -both_builders( "android_arm", WALLEYE_HOST, category = "android|thumb",