diff options
| author |  lberki <lberki@google.com> | 2018-01-10 03:50:32 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-01-10 03:52:35 -0800 |
| commit | 13abaab801d40800fb8b86f79d81cd1ff860c5a4 (patch) | |
| tree | 11cadafdab56e05ba0dbb85c4a58b2564b8aef95 /src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java | |
| parent | 1c59e78215f7beaa10229df48f483779ebad8217 (diff) | |
Remove package loading from JvmConfigurationLoader .
This should not cause a user-visible change: --{host_,}javabase was already
required to point to a java_runtime_suite / java_runtime rule, the only change is that
we now enforce it differently.
If anything, this makes Bazel more lenient in that it now accepts Skylark rules
that provide JavaRuntimeInfo, but I doubt anyone does that, since it does not
work at HEAD.
RELNOTES: None.
PiperOrigin-RevId: 181444563
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java index 062192ff29..43c3e916a1 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java @@ -54,6 +54,7 @@ import com.google.devtools.build.lib.rules.java.JavaHelper; import com.google.devtools.build.lib.rules.java.JavaInfo; import com.google.devtools.build.lib.rules.java.JavaLibraryHelper; import com.google.devtools.build.lib.rules.java.JavaRuleOutputJarsProvider; +import com.google.devtools.build.lib.rules.java.JavaRuntimeInfo; import com.google.devtools.build.lib.rules.java.JavaSemantics; import com.google.devtools.build.lib.rules.java.JavaSkylarkApiProvider; import com.google.devtools.build.lib.rules.java.JavaSourceJarsProvider; @@ -125,7 +126,10 @@ public class JavaLiteProtoAspect extends NativeAspectClass implements Configured ImmutableList.<Class<? extends TransitiveInfoProvider>>of( ProtoLangToolchainProvider.class)) .value(getProtoToolchainLabel(defaultProtoToolchainLabel))) - .add(attr(":host_jdk", LABEL).cfg(HostTransition.INSTANCE).value(hostJdkAttribute)) + .add(attr(":host_jdk", LABEL) + .cfg(HostTransition.INSTANCE) + .value(hostJdkAttribute) + .mandatoryProviders(JavaRuntimeInfo.PROVIDER.id())) .add( attr(":java_toolchain", LABEL) .useOutputLicenses() |