Removed BuildConfiguration.Fragment#getName() and #isSkylarkVisible().

Instead, the SkylarkModule annotation is being used to identify fragments that are visible in Skylark.

--
MOS_MIGRATED_REVID=99930512

3 files changed, 1 insertions, 31 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
index b410f7e691..f72c4f34c0 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
@@ -663,16 +663,6 @@ public class CppConfiguration extends BuildConfiguration.Fragment {
     this.additionalMakeVariables = ImmutableMap.copyOf(makeVariablesBuilder);
   }
 
-  @Override
-  public boolean isSkylarkVisible() {
-    return true;
-  }
-
-  @Override
-  public String getName() {
-    return "cpp";
-  }
-
   private List<OptionalFlag> convertOptionalOptions(
           List<CrosstoolConfig.CToolchain.OptionalFlag> optionalFlagList)
       throws IllegalArgumentException {
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java
index 71454c6ef5..2151bffc2c 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java
@@ -34,7 +34,7 @@ import java.util.List;
  * A java compiler configuration containing the flags required for compilation.
  */
 @Immutable
-@SkylarkModule(name = "java_configuration", doc = "A java compiler configuration")
+@SkylarkModule(name = "java", doc = "A java compiler configuration")
 public final class JavaConfiguration extends Fragment {
   /**
    * Values for the --experimental_java_classpath option
@@ -104,16 +104,6 @@ public final class JavaConfiguration extends Fragment {
     }
     this.translationTargets = translationsBuilder.build();
   }
-  
-  @Override
-  public boolean isSkylarkVisible() {
-    return true;
-  }
-
-  @Override
-  public String getName() {
-    return "java";
-  }
 
   @SkylarkCallable(name = "default_javac_flags", structField = true,
       doc = "The default flags for the Java compiler.")
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 378dc60462..d822da836c 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
@@ -46,16 +46,6 @@ public final class Jvm extends BuildConfiguration.Fragment {
     this.javaHome = javaHome;
     this.jvmLabel = jvmLabel;
   }
-  
-  @Override
-  public boolean isSkylarkVisible() {
-    return true;
-  }
-
-  @Override
-  public String getName() {
-    return "jvm";
-  }
 
   @Override
   public void addImplicitLabels(Multimap<String, Label> implicitLabels) {