Merge branch 'tf-02b-remove-split-transition-provide' into tf-02z-merge

katre · Mar 26, 2019 · b304d2c · b304d2c
2 parents 84e3098 + 5702061
commit b304d2c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/...a/com/google/devtools/build/lib/analysis/skylark/StarlarkAttributeTransitionProvider.java b/...a/com/google/devtools/build/lib/analysis/skylark/StarlarkAttributeTransitionProvider.java
@@ -73,6 +73,11 @@ public SplitTransition create(RuleTransitionData data) {
         starlarkDefinedConfigTransition, (ConfiguredAttributeMapper) attributeMap);
   }
 
+  @Override
+  public boolean isSplit() {
+    return true;
+  }
+
   @Override
   public void repr(SkylarkPrinter printer) {
     printer.append("<transition object>");

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/CircularDependencyTest.java b/src/test/java/com/google/devtools/build/lib/analysis/CircularDependencyTest.java
@@ -284,6 +284,11 @@ public SplitTransition create(RuleTransitionData data) {
                             return ImmutableList.of(newOptions);
                           };
                         }
+
+                        @Override
+                        public boolean isSplit() {
+                          return true;
+                        }
                       }));
 
   @Override

diff --git a/src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java b/src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java
@@ -311,6 +311,11 @@ private static class TestSplitTransitionProvider
     public SplitTransition create(RuleTransitionData data) {
       return new TestSplitTransition();
     }
+
+    @Override
+    public boolean isSplit() {
+      return true;
+    }
   }
 
   @Test