Now that we don't do .class file replacement within binaries, drop the superfluous .toString() calls from Constants.java .

--
MOS_MIGRATED_REVID=117429096

1 files changed, 2 insertions, 5 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/Constants.java b/src/main/java/com/google/devtools/build/lib/Constants.java
index e080f26a3d..149977fa4f 100644
--- a/src/main/java/com/google/devtools/build/lib/Constants.java
+++ b/src/main/java/com/google/devtools/build/lib/Constants.java
@@ -21,9 +21,6 @@ import com.google.common.collect.ImmutableSet;
  * A temporary class of constants; these encode differences between Google's internal setup and
  * Bazel. We're working to remove this class, which requires cleaning up our internal code base.
  * Please don't add anything here unless you know what you're doing.
- *
- * <p>The extra {@code .toString()} calls are there so that javac doesn't inline these constants
- * so that we can replace this class file within a binary.
  */
 public final class Constants {
   private Constants() {}
@@ -38,12 +35,12 @@ public final class Constants {
   public static final String NATIVE_DEPS_LIB_SUFFIX = "_nativedeps";
 
   // Locations of implicit Android SDK dependencies.
-  public static final String ANDROID_DEFAULT_SDK = "//external:android/sdk".toString();
+  public static final String ANDROID_DEFAULT_SDK = "//external:android/sdk";
 
   // If the --fat_apk_cpu flag is not set, we use this as the default value.
   public static final ImmutableList<String> ANDROID_DEFAULT_FAT_APK_CPUS =
       ImmutableList.<String>of("armeabi-v7a");
 
   // Most other tools dependencies use this; we plan to split it into per-language repositories.
-  public static final String TOOLS_REPOSITORY = "@bazel_tools".toString();
+  public static final String TOOLS_REPOSITORY = "@bazel_tools";
 }