From 6be02e0c3f3284ae30c71a59d3b0ea505c4056c4 Mon Sep 17 00:00:00 2001 From: Andrew Krieger Date: Mon, 12 Jan 2026 12:20:54 -0800 Subject: [PATCH 1/3] Migrate asan config_setting to new unified constraint. Summary: WTTS. Just sed. And then delete the old one. Reviewed By: aforster Differential Revision: D88306710 --- shim_et/xplat/executorch/build/runtime_wrapper.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shim_et/xplat/executorch/build/runtime_wrapper.bzl b/shim_et/xplat/executorch/build/runtime_wrapper.bzl index f03ddc6c76d..0e84a81b017 100644 --- a/shim_et/xplat/executorch/build/runtime_wrapper.bzl +++ b/shim_et/xplat/executorch/build/runtime_wrapper.bzl @@ -105,7 +105,7 @@ def _patch_build_mode_flags(kwargs): # @oss-disable: "ovr_config//build_mode:opt": ["-D__ET_BUILD_MODE_OPT=1"], }) + select({ "DEFAULT": [], - # @oss-disable: "ovr_config//build_mode:asan": ["-D__ET_BUILD_MODE_ASAN=1"], + # @oss-disable: "ovr_config//build_mode:sanitizer_type[asan]": ["-D__ET_BUILD_MODE_ASAN=1"], # @oss-disable: "ovr_config//build_mode:tsan": ["-D__ET_BUILD_MODE_TSAN=1"], # @oss-disable: "ovr_config//build_mode:ubsan": ["-D__ET_BUILD_MODE_UBSAN=1"], # @oss-disable: "ovr_config//build_mode:lto-fat": ["-D__ET_BUILD_MODE_LTO=1"], From c1907b4eb9d05b5e81cf29ae05dba8dadc27716b Mon Sep 17 00:00:00 2001 From: Andrew Krieger Date: Mon, 12 Jan 2026 12:20:54 -0800 Subject: [PATCH 2/3] Migrate tsan config_setting to new unified constraint. (#16528) Summary: WTTS. Just sed. And then delete the old one. Reviewed By: rexzhang123 Differential Revision: D88306709 --- shim_et/xplat/executorch/build/runtime_wrapper.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shim_et/xplat/executorch/build/runtime_wrapper.bzl b/shim_et/xplat/executorch/build/runtime_wrapper.bzl index 0e84a81b017..b6a1b685d63 100644 --- a/shim_et/xplat/executorch/build/runtime_wrapper.bzl +++ b/shim_et/xplat/executorch/build/runtime_wrapper.bzl @@ -106,7 +106,7 @@ def _patch_build_mode_flags(kwargs): }) + select({ "DEFAULT": [], # @oss-disable: "ovr_config//build_mode:sanitizer_type[asan]": ["-D__ET_BUILD_MODE_ASAN=1"], - # @oss-disable: "ovr_config//build_mode:tsan": ["-D__ET_BUILD_MODE_TSAN=1"], + # @oss-disable: "ovr_config//build_mode:sanitizer_type[tsan]": ["-D__ET_BUILD_MODE_TSAN=1"], # @oss-disable: "ovr_config//build_mode:ubsan": ["-D__ET_BUILD_MODE_UBSAN=1"], # @oss-disable: "ovr_config//build_mode:lto-fat": ["-D__ET_BUILD_MODE_LTO=1"], # @oss-disable: "ovr_config//build_mode:code-coverage": ["-D__ET_BUILD_MODE_COV=1"], From 873776a107d245fb64a39d9654a0e59d3ec1ab84 Mon Sep 17 00:00:00 2001 From: Andrew Krieger Date: Mon, 12 Jan 2026 12:20:54 -0800 Subject: [PATCH 3/3] Migrate ubsan config_setting to new unified constraint. (#16529) Summary: WTTS. Just sed. And then delete the old one. Reviewed By: quittle, malfet Differential Revision: D88306707 --- shim_et/xplat/executorch/build/runtime_wrapper.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shim_et/xplat/executorch/build/runtime_wrapper.bzl b/shim_et/xplat/executorch/build/runtime_wrapper.bzl index b6a1b685d63..e38adf31416 100644 --- a/shim_et/xplat/executorch/build/runtime_wrapper.bzl +++ b/shim_et/xplat/executorch/build/runtime_wrapper.bzl @@ -107,7 +107,7 @@ def _patch_build_mode_flags(kwargs): "DEFAULT": [], # @oss-disable: "ovr_config//build_mode:sanitizer_type[asan]": ["-D__ET_BUILD_MODE_ASAN=1"], # @oss-disable: "ovr_config//build_mode:sanitizer_type[tsan]": ["-D__ET_BUILD_MODE_TSAN=1"], - # @oss-disable: "ovr_config//build_mode:ubsan": ["-D__ET_BUILD_MODE_UBSAN=1"], + # @oss-disable: "ovr_config//build_mode:sanitizer_type[ubsan]": ["-D__ET_BUILD_MODE_UBSAN=1"], # @oss-disable: "ovr_config//build_mode:lto-fat": ["-D__ET_BUILD_MODE_LTO=1"], # @oss-disable: "ovr_config//build_mode:code-coverage": ["-D__ET_BUILD_MODE_COV=1"], })