commit bbccf4bc629b654a8867a2a50faa6c8a73bffdb7
author Googler <noreply@google.com> Wed Jun 05 13:08:26 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Wed Jun 05 13:09:17 2019 -0700
tree 6c15eda64a410dca96b75baf8cfcb3b6e2592657
parent 035d56cb7c05575c44a2d8917d53d87a8ddd68de

Unroll the nested set and add as a direct member in addElementsFromStarlark.

PiperOrigin-RevId: 251702314

src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProvider.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProvider.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProvider.java
index 973c6ef..6269d4b 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProvider.java
@@ -1131,7 +1131,8 @@
      */
     void addElementsFromSkylark(Key<?> key, Object skylarkToAdd) throws EvalException {
       NestedSet<?> toAdd = ObjcProviderSkylarkConverters.convertToJava(key, skylarkToAdd);
-      uncheckedAddTransitive(key, toAdd, this.items);
+      // TODO(b/134586996): toAdd should be added as a transitive member, but this causes breakages.
+      uncheckedAddAll(key, toAdd.toList(), this.items);
       if (ObjcProvider.KEYS_FOR_DIRECT.contains(key)) {
         uncheckedAddAllDirect(key, toAdd, this.directItems);
       }