In TestsInSuiteValue, replace Target member with Label. This makes

TestsInSuiteValue serializable.

PiperOrigin-RevId: 196831698

1 files changed, 2 insertions, 5 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TestSuiteExpansionFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/TestSuiteExpansionFunction.java
index a20168396b..0b563f74b9 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/TestSuiteExpansionFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/TestSuiteExpansionFunction.java
@@ -31,7 +31,6 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 
 /**
@@ -62,10 +61,8 @@ final class TestSuiteExpansionFunction implements SkyFunction {
         TestsInSuiteValue value = (TestsInSuiteValue) testsInSuites.get(
             TestsInSuiteValue.key(target, true));
         if (value != null) {
-          result.addAll(value.getTargets().getTargets().stream()
-              .map(Target::getLabel)
-              .collect(Collectors.toList()));
-          hasError |= value.getTargets().hasError();
+          result.addAll(value.getLabels().getTargets());
+          hasError |= value.getLabels().hasError();
         }
       } else {
         result.add(target.getLabel());