Skip to content
Merged
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions rules_java_gapic/java_gapic_pkg.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,7 @@ java_gapic_srcs_pkg = rule(
def java_gapic_assembly_gradle_pkg(
name,
deps,
include_samples = False,
assembly_name = None,
transport = None,
**kwargs):
Expand All @@ -341,9 +342,9 @@ def java_gapic_assembly_gradle_pkg(
processed_deps = {} #there is no proper Set in Starlark
for dep in deps:
# Use contains instead of endswith since microgenerator testing may use differently-named targets.
if "samples" in dep:
samples.append(dep)
elif "_java_gapic" in dep:
if "_java_gapic" in dep:
if include_samples:
samples.append(dep + "_samples")
_put_dep_in_a_bucket(dep, client_deps, processed_deps)
_put_dep_in_a_bucket("%s_test" % dep, client_test_deps, processed_deps)
_put_dep_in_a_bucket("%s_resource_name" % dep, proto_deps, processed_deps)
Expand Down