Roll forward with adding nested set as transitive member.
Now that --incompatible_objc_framework_cleanup is true, the breakage caused by ordering of framework header search paths will no longer occur as described in b/134586996#comment16.
RELNOTES: None.
@@ -1131,8 +1131,7 @@ public final class ObjcProvider extends Info implements ObjcProviderApi<Artifact
*/
void addElementsFromSkylark(Key<?> key, Object skylarkToAdd) throws EvalException {
NestedSet<?> toAdd = ObjcProviderSkylarkConverters.convertToJava(key, skylarkToAdd);
- // TODO(b/134586996): toAdd should be added as a transitive member, but this causes breakages.
- uncheckedAddAll(key, toAdd.toList(), this.items);
+ uncheckedAddTransitive(key, toAdd, this.items);
if (ObjcProvider.KEYS_FOR_DIRECT.contains(key)) {
uncheckedAddAllDirect(key, toAdd, this.directItems);
}
