commit 645c42bae42fc8ea1c5b7c53e4962f1987ff888e
author jcater <jcater@google.com> Wed May 12 09:35:48 2021 -0700
committer Copybara-Service <copybara-worker@google.com> Wed May 12 09:37:06 2021 -0700
tree ee4b55cd26d679191523447be787b3dd54ec6682
parent 68e019889a7dddf1b006747dac957e4a3bc8e41c

Create a new ExecGroupCollection container to manage exec group inheritance and exec property parsing.

Fixes #13459.

PiperOrigin-RevId: 373388266

src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
index f777385..44ab8a7 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
@@ -30,10 +30,10 @@
 import com.google.devtools.build.lib.analysis.ConfiguredTargetValue;
 import com.google.devtools.build.lib.analysis.DependencyKind;
 import com.google.devtools.build.lib.analysis.DuplicateException;
+import com.google.devtools.build.lib.analysis.ExecGroupCollection.InvalidExecGroupException;
 import com.google.devtools.build.lib.analysis.InconsistentAspectOrderException;
 import com.google.devtools.build.lib.analysis.PlatformOptions;
 import com.google.devtools.build.lib.analysis.ResolvedToolchainContext;
-import com.google.devtools.build.lib.analysis.RuleContext.InvalidExecGroupException;
 import com.google.devtools.build.lib.analysis.TargetAndConfiguration;
 import com.google.devtools.build.lib.analysis.ToolchainCollection;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration;