Do not trim test configuration when --nodistinct_host_configuration is on.
Background is in b/117932061. The infrastructure avoids trimming the host configuration and thus the untrimmed target configuration is used in various places when --nodistinct_host_configuration is on. This leads to potential issues.
This may fixable more principally by allowing and ensuring the effective host configuration is trimmed when --nodistinct_host_configuration is in use; however, this requires far more intricate adjustments to configuration resolution.
PiperOrigin-RevId: 364898085
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BUILD b/src/main/java/com/google/devtools/build/lib/analysis/BUILD
index a85fba4..6bcce1e 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BUILD
@@ -2348,6 +2348,7 @@
deps = [
":config/build_options",
":config/build_options_cache",
+ ":config/core_options",
":config/fragment_options",
":config/transitions/no_transition",
":config/transitions/patch_transition",