From 40b804d7681d37c873bf81d93d3bc3026c812f34 Mon Sep 17 00:00:00 2001 From: mai93 Date: Tue, 15 Dec 2020 15:59:04 +0200 Subject: [PATCH] Pass host_action_env to hostActionEnvironment attribute of host options --- src/jdeps_modules.golden | 1 + .../lib/analysis/config/ExecutionTransitionFactory.java | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/jdeps_modules.golden b/src/jdeps_modules.golden index e3f2deeb59f97c..4584f9d392fdfc 100644 --- a/src/jdeps_modules.golden +++ b/src/jdeps_modules.golden @@ -2,6 +2,7 @@ java.base java.compiler java.instrument java.logging +java.management java.naming java.sql java.xml diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactory.java b/src/main/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactory.java index c0ee7501ae1ae3..54c07569fc196d 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactory.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactory.java @@ -109,9 +109,8 @@ public ImmutableSet> requiresOptionFragments() @Override public BuildOptions patch(BuildOptionsView options, EventHandler eventHandler) { - if (executionPlatform == null || options.get(CoreOptions.class).isExec) { - // If no execution platform is known or the input already comes from execution configuration, - // don't change anything and return the existing value. + if (executionPlatform == null) { + // No execution platform is known, so don't change anything. return options.underlying(); } return cache.applyTransition(