Internal change

PiperOrigin-RevId: 621869826

Author: lauraharker

src/com/google/javascript/jscomp/CompilerOptions.java

@@ -41,7 +41,6 @@
 import com.google.javascript.jscomp.deps.ModuleLoader.ResolutionMode;
 import com.google.javascript.jscomp.parsing.Config;
 import com.google.javascript.jscomp.parsing.parser.FeatureSet;
-import com.google.javascript.jscomp.resources.ResourceLoader;
 import com.google.javascript.rhino.IR;
 import com.google.javascript.rhino.Node;
 import com.google.javascript.rhino.SourcePosition;
@@ -1126,15 +1125,8 @@ public boolean getAssumeStaticInheritanceIsNotUsed() {
 
   private String productionInstrumentationArrayName;
 
-  private static final ImmutableList<ConformanceConfig> GLOBAL_CONFORMANCE_CONFIGS =
-      ImmutableList.of(ResourceLoader.loadGlobalConformance(CompilerOptions.class));
-
-  /**
-   * List of conformance configs to use in CheckConformance.
-   *
-   * <p>The first entry of this list is always the Global ConformanceConfig
-   */
-  private ImmutableList<ConformanceConfig> conformanceConfigs = GLOBAL_CONFORMANCE_CONFIGS;
+  /** List of conformance configs to use in CheckConformance. */
+  private ImmutableList<ConformanceConfig> conformanceConfigs = ImmutableList.of();
 
   /**
    * Remove the first match of this regex from any paths when checking conformance whitelists.
@@ -2667,11 +2659,7 @@ public void setConformanceConfig(ConformanceConfig conformanceConfig) {
   /** Both enable and configure conformance checks, if non-null. */
   @GwtIncompatible("Conformance")
   public void setConformanceConfigs(List<ConformanceConfig> configs) {
-    this.conformanceConfigs =
-        ImmutableList.<ConformanceConfig>builder()
-            .add(ResourceLoader.loadGlobalConformance(CompilerOptions.class))
-            .addAll(configs)
-            .build();
+    this.conformanceConfigs = ImmutableList.copyOf(configs);
   }
 
   public void clearConformanceConfigs() {

src/com/google/javascript/jscomp/resources/ResourceLoader.java

@@ -21,7 +21,6 @@
 import com.google.common.annotations.GwtIncompatible;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.io.CharStreams;
-import com.google.javascript.jscomp.ConformanceConfig;
 import java.io.IOException;
 import java.io.InputStreamReader;
 
@@ -48,19 +47,6 @@ public static ImmutableMap<String, String> loadPropertiesMap(
     return PropertiesParser.parse(loadTextResource(clazz, resourceName));
   }
 
-  /** Load the global ConformanceConfig */
-  public static ConformanceConfig loadGlobalConformance(Class<?> clazz) {
-    ConformanceConfig.Builder builder = ConformanceConfig.newBuilder();
-    if (resourceExists(clazz, "global_conformance.binarypb")) {
-      try {
-        builder.mergeFrom(clazz.getResourceAsStream("global_conformance.binarypb"));
-      } catch (IOException e) {
-        throw new RuntimeException(e);
-      }
-    }
-    return builder.build();
-  }
-
   public static boolean resourceExists(Class<?> clazz, String path) {
     return clazz.getResource(path) != null;
   }

src/com/google/javascript/jscomp/resources/super/com/google/javascript/jscomp/resources/ResourceLoader.java

@@ -17,7 +17,6 @@
 package com.google.javascript.jscomp.resources;
 
 import com.google.common.collect.ImmutableMap;
-import com.google.javascript.jscomp.ConformanceConfig;
 import jsinterop.annotations.JsType;
 import jsinterop.base.JsPropertyMap;
 
@@ -41,10 +40,6 @@ public static ImmutableMap<String, String> loadPropertiesMap(String resourceName
     return PropertiesParser.parse(loadTextResource(null, resourceName));
   }
 
-  public static ConformanceConfig loadGlobalConformance(Class<?> clazz) {
-    return ConformanceConfig.newBuilder().build();
-  }
-
   public static boolean resourceExists(Class<?> clazz, String path) {
     // TODO(sdh): this is supposed to be relative to the given class, but
     // GWT can't handle that - probably better to remove the class argument