diff options
| author |  cushon <cushon@google.com> | 2018-07-03 08:28:45 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-07-03 08:30:30 -0700 |
| commit | 1ee159adf2ef18590872f8c0478af441e24e8268 (patch) | |
| tree | 7cd14ed6047bd4e03786eb5f3a36f3ba9eda4b61 /src/main/java/com/google/devtools/build/lib/rules/java | |
| parent | 29fe1d7de11aa421f0bd43e839aafe46b0354197 (diff) | |
Restore pre-https://github.com/bazelbuild/bazel/commit/4a2002043ed3907223a403e8b8fc66975e516fd8 behaviour for non-strict proto classpaths
PiperOrigin-RevId: 203126457
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/java/proto/StrictDepsUtils.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/proto/StrictDepsUtils.java b/src/main/java/com/google/devtools/build/lib/rules/java/proto/StrictDepsUtils.java index 08522e89df..08daa22de2 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/proto/StrictDepsUtils.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/proto/StrictDepsUtils.java @@ -72,10 +72,10 @@ public class StrictDepsUtils { JavaCompilationArgsProvider directJars, ImmutableList<TransitiveInfoCollection> protoRuntimes) { JavaCompilationArgsProvider.Builder result = JavaCompilationArgsProvider.builder(); + result.addExports(directJars); for (JavaProtoLibraryAspectProvider p : deps) { result.addExports(p.getNonStrictCompArgs()); } - result.addExports(directJars); for (TransitiveInfoCollection t : protoRuntimes) { JavaCompilationArgsProvider p = JavaInfo.getProvider(JavaCompilationArgsProvider.class, t); if (p != null) { |