aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar lberki <lberki@google.com>2018-01-10 06:15:02 -0800
committerGravatar Copybara-Service <copybara-piper@google.com>2018-01-10 06:17:13 -0800
commit15961269f0f7433f3877669ec38a5b59c95c354c (patch)
treec835873a56a849523586eb00460aacde6a4dfd53
parent32dff21d00ad7d1bdf50e8761d675a6e7e002de9 (diff)
Remove ctx.fragments.jvm .
It contained no fields or any other information accessible from Skylark, so it's not a big loss. RELNOTES[INC]: ctx.fragments.jvm is not available anymore. PiperOrigin-RevId: 181455474
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/java/Jvm.java7
-rw-r--r--src/test/java/com/google/devtools/build/lib/skylark/SkylarkDefinedAspectsTest.java9
2 files changed, 5 insertions, 11 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/Jvm.java b/src/main/java/com/google/devtools/build/lib/rules/java/Jvm.java
index 31e46d1570..bedb92bde5 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/Jvm.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/Jvm.java
@@ -20,18 +20,11 @@ import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec;
import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
-import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
-import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory;
/**
* This class represents a Java virtual machine with a path.
*/
@AutoCodec
-@SkylarkModule(
- name = "jvm",
- category = SkylarkModuleCategory.CONFIGURATION_FRAGMENT,
- doc = "A configuration fragment representing the Java virtual machine."
-)
@Immutable
public final class Jvm extends BuildConfiguration.Fragment {
public static final ObjectCodec<Jvm> CODEC = new Jvm_AutoCodec();
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkDefinedAspectsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkDefinedAspectsTest.java
index d5548d4510..9d29f28fbd 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkDefinedAspectsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkDefinedAspectsTest.java
@@ -39,7 +39,7 @@ import com.google.devtools.build.lib.packages.SkylarkProvider.SkylarkKey;
import com.google.devtools.build.lib.packages.util.MockObjcSupport;
import com.google.devtools.build.lib.packages.util.MockProtoSupport;
import com.google.devtools.build.lib.rules.cpp.CppConfiguration;
-import com.google.devtools.build.lib.rules.java.Jvm;
+import com.google.devtools.build.lib.rules.java.JavaConfiguration;
import com.google.devtools.build.lib.rules.objc.ObjcProtoProvider;
import com.google.devtools.build.lib.skyframe.AspectValue;
import com.google.devtools.build.lib.syntax.SkylarkList;
@@ -203,7 +203,7 @@ public class SkylarkDefinedAspectsTest extends AnalysisTestCase {
"def _impl(target, ctx):",
" print('This aspect does nothing')",
" return struct()",
- "MyAspect = aspect(implementation=_impl, fragments=['jvm'], host_fragments=['cpp'])");
+ "MyAspect = aspect(implementation=_impl, fragments=['java'], host_fragments=['cpp'])");
scratch.file("test/BUILD", "java_library(name = 'xxx',)");
AnalysisResult analysisResult =
@@ -212,11 +212,12 @@ public class SkylarkDefinedAspectsTest extends AnalysisTestCase {
AspectDefinition aspectDefinition = aspectValue.getAspect().getDefinition();
assertThat(
aspectDefinition.getConfigurationFragmentPolicy()
- .isLegalConfigurationFragment(Jvm.class, ConfigurationTransitionProxy.NONE))
+ .isLegalConfigurationFragment(JavaConfiguration.class,
+ ConfigurationTransitionProxy.NONE))
.isTrue();
assertThat(
aspectDefinition.getConfigurationFragmentPolicy()
- .isLegalConfigurationFragment(Jvm.class, HostTransition.INSTANCE))
+ .isLegalConfigurationFragment(JavaConfiguration.class, HostTransition.INSTANCE))
.isFalse();
assertThat(
aspectDefinition.getConfigurationFragmentPolicy()