Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stop given a depset as the first unnamed argument to the depset() con… #480

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Stop given a depset as the first unnamed argument to the depset() con… #480

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions closure/compiler/closure_js_library.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ def _closure_js_library_impl(
lenient,
convention,
includes = (),
exports = depset(),
internal_descriptors = depset(),
exports = [],
internal_descriptors = [],
no_closure_library = False,
internal_expect_failure = False,

Expand Down Expand Up @@ -313,9 +313,6 @@ def _closure_js_library_impl(
unusable_type_definition = unusable_type_definition,
)

if type(internal_descriptors) == "list":
internal_descriptors = depset(internal_descriptors)

# We now export providers to any parent Target. This is considered a public
# interface because other Skylark rules can be designed to do things with
# this data. Other Skylark rules can even export their own provider with the
Expand Down Expand Up @@ -374,7 +371,7 @@ def _closure_js_library_impl(
# closure. It is used so Closure Templates can have information about
# the structure of protobufs so they can be easily rendered in .soy
# files with type safety. See closure_js_template_library.bzl.
descriptors = depset(transitive = [js.descriptors, internal_descriptors]),
descriptors = depset(internal_descriptors, transitive = [js.descriptors]),
# NestedSet<Label> of all closure_css_library rules in the transitive
# closure. This is used by closure_js_binary can guarantee the
# completeness of goog.getCssName() substitutions.
Expand Down