diff options
| author |  Lukacs Berki <lberki@google.com> | 2016-10-26 13:42:38 +0000 |
|---|---|---|
| committer |  Laszlo Csomor <laszlocsomor@google.com> | 2016-10-27 09:23:39 +0000 |
| commit | 0e40d5c26612c0acae9f1f0fee58f40e5d31dcc8 (patch) | |
| tree | 0d986a1cd5cb2923891a37e324a0492c981c310b /src/main/java/com/google/devtools | |
| parent | 3d4868303d9b4a0b682de77cbe231d9e59771192 (diff) | |
Fix a few issues that prevented Bazel from building with Java 7.
--
MOS_MIGRATED_REVID=137269807
Diffstat (limited to 'src/main/java/com/google/devtools')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoLibrary.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoLibrary.java index 6678202dcd..21d3e6f110 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoLibrary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoLibrary.java @@ -14,7 +14,6 @@ package com.google.devtools.build.lib.rules.java.proto; -import static com.google.common.collect.Iterables.transform; import static com.google.devtools.build.lib.analysis.RuleConfiguredTarget.Mode.TARGET; import static com.google.devtools.build.lib.collect.nestedset.Order.STABLE_ORDER; import static com.google.devtools.build.lib.rules.java.proto.JavaLiteProtoAspect.LITE_PROTO_RUNTIME_ATTR; @@ -62,7 +61,7 @@ public class JavaLiteProtoLibrary implements RuleConfiguredTargetFactory { JavaSourceJarsProvider sourceJarsProvider = JavaSourceJarsProvider.merge( - transform( + Iterables.<JavaSourceJarsAspectProvider, JavaSourceJarsProvider>transform( getDeps(ruleContext, JavaSourceJarsAspectProvider.class), JavaSourceJarsAspectProvider.GET_PROVIDER)); |