RELNOTES: Improve Android split transition handling.
--
MOS_MIGRATED_REVID=128184440
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
index f4aeb47..48e7f98 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
@@ -16,6 +16,7 @@
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Joiner;
+import com.google.common.base.Optional;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
import com.google.common.collect.ImmutableBiMap;
@@ -681,8 +682,8 @@
// deeply nested and we can't easily inject the behavior we want. However, we should fix all
// such call sites.
checkAttribute(attributeName, Mode.SPLIT);
- Map<String, ? extends List<? extends TransitiveInfoCollection>> map =
- getSplitPrerequisites(attributeName, /*requireSplit=*/false);
+ Map<Optional<String>, ? extends List<? extends TransitiveInfoCollection>> map =
+ getSplitPrerequisites(attributeName);
return map.isEmpty()
? ImmutableList.<TransitiveInfoCollection>of()
: map.entrySet().iterator().next().getValue();
@@ -693,35 +694,21 @@
}
/**
- * Returns the a prerequisites keyed by the CPU of their configurations; this method throws an
- * exception if the split transition is not active.
+ * Returns the a prerequisites keyed by the CPU of their configurations.
+ * If the split transition is not active (e.g. split() returned an empty
+ * list), the key is an empty Optional.
*/
- public Map<String, ? extends List<? extends TransitiveInfoCollection>>
+ public Map<Optional<String>, ? extends List<? extends TransitiveInfoCollection>>
getSplitPrerequisites(String attributeName) {
- return getSplitPrerequisites(attributeName, /*requireSplit*/true);
- }
-
- private Map<String, ? extends List<? extends TransitiveInfoCollection>>
- getSplitPrerequisites(String attributeName, boolean requireSplit) {
checkAttribute(attributeName, Mode.SPLIT);
Attribute attributeDefinition = getAttribute(attributeName);
SplitTransition<?> transition = attributeDefinition.getSplitTransition(rule);
List<BuildConfiguration> configurations =
- getConfiguration().getTransitions().getSplitConfigurations(transition);
- if (configurations.size() == 1) {
- // There are two cases here:
- // 1. Splitting is enabled, but only one target cpu.
- // 2. Splitting is disabled, and no --cpu value was provided on the command line.
- // In the first case, the cpu value is non-null, but in the second case it is null. We only
- // allow that to proceed if the caller specified that he is going to ignore the cpu value
- // anyway.
- String cpu = configurations.get(0).getCpu();
- if (cpu == null) {
- Preconditions.checkState(!requireSplit);
- cpu = "DO_NOT_USE";
- }
- return ImmutableMap.of(cpu, targetMap.get(attributeName));
+ getConfiguration().getTransitions().getSplitConfigurationsNoSelf(transition);
+ if (configurations.isEmpty()) {
+ // The split transition is not active. Defer the decision on which CPU to use.
+ return ImmutableMap.of(Optional.<String>absent(), targetMap.get(attributeName));
}
Set<String> cpus = new HashSet<>();
@@ -733,15 +720,15 @@
}
// Use an ImmutableListMultimap.Builder here to preserve ordering.
- ImmutableListMultimap.Builder<String, TransitiveInfoCollection> result =
+ ImmutableListMultimap.Builder<Optional<String>, TransitiveInfoCollection> result =
ImmutableListMultimap.builder();
for (TransitiveInfoCollection t : targetMap.get(attributeName)) {
if (t.getConfiguration() != null) {
- result.put(t.getConfiguration().getCpu(), t);
+ result.put(Optional.of(t.getConfiguration().getCpu()), t);
} else {
// Source files don't have a configuration, so we add them to all architecture entries.
for (String cpu : cpus) {
- result.put(cpu, t);
+ result.put(Optional.of(cpu), t);
}
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationCollection.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationCollection.java
index 3b71ba3..3b6c338 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationCollection.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationCollection.java
@@ -185,6 +185,14 @@
return transitionTable;
}
+ public List<BuildConfiguration> getSplitConfigurationsNoSelf(SplitTransition<?> transition) {
+ if (splitTransitionTable.containsKey(transition)) {
+ return splitTransitionTable.get(transition);
+ } else {
+ return ImmutableList.of();
+ }
+ }
+
public List<BuildConfiguration> getSplitConfigurations(SplitTransition<?> transition) {
if (splitTransitionTable.containsKey(transition)) {
return splitTransitionTable.get(transition);
