diff options
| author |  lberki <lberki@google.com> | 2018-01-11 02:16:14 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-01-11 02:17:54 -0800 |
| commit | 15b77ec8314a6df0608bf027aab5bd5e06dcde07 (patch) | |
| tree | 503bad783fc5b42563119edd2885b5489ff428e2 /src/main/java/com/google/devtools/build/lib/rules/objc | |
| parent | bc704360a93ff65c4d3684ab5cc0e45bd403bdd8 (diff) | |
Fold the Jvm configuration fragment into JavaConfiguration.
RELNOTES: None.
PiperOrigin-RevId: 181579365
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java index 7811b01c51..cf80fe88d8 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java @@ -58,11 +58,11 @@ import com.google.devtools.build.lib.rules.cpp.CppHelper; import com.google.devtools.build.lib.rules.cpp.FdoSupportProvider; import com.google.devtools.build.lib.rules.java.JavaCommon; import com.google.devtools.build.lib.rules.java.JavaCompilationArgsProvider; +import com.google.devtools.build.lib.rules.java.JavaConfiguration; import com.google.devtools.build.lib.rules.java.JavaGenJarsProvider; 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.JavaSourceInfoProvider; -import com.google.devtools.build.lib.rules.java.Jvm; import com.google.devtools.build.lib.rules.objc.CompilationSupport.ExtraCompileArgs; import com.google.devtools.build.lib.rules.objc.J2ObjcSource.SourceType; import com.google.devtools.build.lib.rules.proto.ProtoCommon; @@ -135,7 +135,7 @@ public class J2ObjcAspect extends NativeAspectClass implements ConfiguredAspectF @Override public AspectDefinition getDefinition(AspectParameters aspectParameters) { return ConfigAwareAspectBuilder.of(addAdditionalAttributes(new AspectDefinition.Builder(this))) - .requiresHostConfigurationFragments(Jvm.class) + .requiresHostConfigurationFragments(JavaConfiguration.class) .originalBuilder() .propagateAlongAttribute("deps") .propagateAlongAttribute("exports") |