1 files changed, 12 insertions, 30 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/Link.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/Link.java
index ffbfd76b8d..76018356ea 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/Link.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/Link.java
@@ -28,24 +28,6 @@ import com.google.devtools.build.lib.util.FileTypeSet;
  */
 public abstract class Link {
 
-  /** Name of the action producing static library. */
-  public static final String CPP_LINK_STATIC_LIBRARY_ACTION_NAME = "c++-link-static-library";
-  /** Name of the action producing dynamic library from cc_library. */
-  public static final String CPP_LINK_NODEPS_DYNAMIC_LIBRARY_ACTION_NAME =
-      "c++-link-nodeps-dynamic-library";
-  /** Name of the action producing dynamic library from cc_binary. */
-  public static final String CPP_LINK_DYNAMIC_LIBRARY_ACTION_NAME = "c++-link-dynamic-library";
-  /** Name of the action producing executable binary. */
-  public static final String CPP_LINK_EXECUTABLE_ACTION_NAME = "c++-link-executable";
-  /** Name of the objc action producing static library */
-  public static final String OBJC_ARCHIVE_ACTION_NAME = "objc-archive";
-  /** Name of the objc action producing dynamic library */
-  public static final String OBJC_FULLY_LINK_ACTION_NAME = "objc-fully-link";
-  /** Name of the objc action producing objc executable binary */
-  public static final String OBJC_EXECUTABLE_ACTION_NAME = "objc-executable";
-  /** Name of the objc action producing objc++ executable binary */
-  public static final String OBJCPP_EXECUTABLE_ACTION_NAME = "objc++-executable";
-
   private Link() {} // uninstantiable
 
   /**
@@ -116,7 +98,7 @@ public abstract class Link {
     STATIC_LIBRARY(
         ".a",
         LinkerOrArchiver.ARCHIVER,
-        CPP_LINK_STATIC_LIBRARY_ACTION_NAME,
+        "c++-link-static-library",
         Picness.NOPIC,
         ArtifactCategory.STATIC_LIBRARY,
         Executable.NOT_EXECUTABLE),
@@ -125,7 +107,7 @@ public abstract class Link {
     OBJC_ARCHIVE(
         ".a",
         LinkerOrArchiver.ARCHIVER,
-        OBJC_ARCHIVE_ACTION_NAME,
+        "objc-archive",
         Picness.NOPIC,
         ArtifactCategory.STATIC_LIBRARY,
         Executable.NOT_EXECUTABLE),
@@ -134,7 +116,7 @@ public abstract class Link {
     OBJC_FULLY_LINKED_ARCHIVE(
         ".a",
         LinkerOrArchiver.ARCHIVER,
-        OBJC_FULLY_LINK_ACTION_NAME,
+        "objc-fully-link",
         Picness.NOPIC,
         ArtifactCategory.STATIC_LIBRARY,
         Executable.NOT_EXECUTABLE),
@@ -143,7 +125,7 @@ public abstract class Link {
     OBJC_EXECUTABLE(
         "",
         LinkerOrArchiver.LINKER,
-        OBJC_EXECUTABLE_ACTION_NAME,
+        "objc-executable",
         Picness.NOPIC,
         ArtifactCategory.EXECUTABLE,
         Executable.EXECUTABLE),
@@ -152,7 +134,7 @@ public abstract class Link {
     OBJCPP_EXECUTABLE(
         "",
         LinkerOrArchiver.LINKER,
-        OBJCPP_EXECUTABLE_ACTION_NAME,
+        "objc++-executable",
         Picness.NOPIC,
         ArtifactCategory.EXECUTABLE,
         Executable.EXECUTABLE),
@@ -161,7 +143,7 @@ public abstract class Link {
     PIC_STATIC_LIBRARY(
         ".pic.a",
         LinkerOrArchiver.ARCHIVER,
-        CPP_LINK_STATIC_LIBRARY_ACTION_NAME,
+        "c++-link-static-library",
         Picness.PIC,
         ArtifactCategory.STATIC_LIBRARY,
         Executable.NOT_EXECUTABLE),
@@ -170,7 +152,7 @@ public abstract class Link {
     INTERFACE_DYNAMIC_LIBRARY(
         ".ifso",
         LinkerOrArchiver.LINKER,
-        CPP_LINK_DYNAMIC_LIBRARY_ACTION_NAME,
+        "c++-link-dynamic-library",
         Picness.NOPIC, // Actually PIC but it's not indicated in the file name
         ArtifactCategory.INTERFACE_LIBRARY,
         Executable.NOT_EXECUTABLE),
@@ -179,7 +161,7 @@ public abstract class Link {
     NODEPS_DYNAMIC_LIBRARY(
         ".so",
         LinkerOrArchiver.LINKER,
-        CPP_LINK_NODEPS_DYNAMIC_LIBRARY_ACTION_NAME,
+        "c++-link-nodeps-dynamic-library",
         Picness.NOPIC, // Actually PIC but it's not indicated in the file name
         ArtifactCategory.DYNAMIC_LIBRARY,
         Executable.NOT_EXECUTABLE),
@@ -187,7 +169,7 @@ public abstract class Link {
     DYNAMIC_LIBRARY(
         ".so",
         LinkerOrArchiver.LINKER,
-        CPP_LINK_DYNAMIC_LIBRARY_ACTION_NAME,
+        "c++-link-dynamic-library",
         Picness.NOPIC, // Actually PIC but it's not indicated in the file name
         ArtifactCategory.DYNAMIC_LIBRARY,
         Executable.NOT_EXECUTABLE),
@@ -196,7 +178,7 @@ public abstract class Link {
     ALWAYS_LINK_STATIC_LIBRARY(
         ".lo",
         LinkerOrArchiver.ARCHIVER,
-        CPP_LINK_STATIC_LIBRARY_ACTION_NAME,
+        "c++-link-static-library",
         Picness.NOPIC,
         ArtifactCategory.ALWAYSLINK_STATIC_LIBRARY,
         Executable.NOT_EXECUTABLE),
@@ -205,7 +187,7 @@ public abstract class Link {
     ALWAYS_LINK_PIC_STATIC_LIBRARY(
         ".pic.lo",
         LinkerOrArchiver.ARCHIVER,
-        CPP_LINK_STATIC_LIBRARY_ACTION_NAME,
+        "c++-link-static-library",
         Picness.PIC,
         ArtifactCategory.ALWAYSLINK_STATIC_LIBRARY,
         Executable.NOT_EXECUTABLE),
@@ -214,7 +196,7 @@ public abstract class Link {
     EXECUTABLE(
         "",
         LinkerOrArchiver.LINKER,
-        CPP_LINK_EXECUTABLE_ACTION_NAME,
+        "c++-link-executable",
         Picness.NOPIC, // Picness is not indicate in the file name
         ArtifactCategory.EXECUTABLE,
         Executable.EXECUTABLE);