Record the category of the artifact to be linked in LinkerInput.

It's currently only used for sanity checks, but the idea is that we'll use this field to decide what to do with a given linker input instead of inferring things from its file name.

Also make artifact name creation a bit simpler by using the same set of variables for compiler and linker outputs.

--
MOS_MIGRATED_REVID=129990944

1 files changed, 1 insertions, 7 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/ArtifactCategory.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/ArtifactCategory.java
index df58dbf9e2..68ec14b4bd 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/ArtifactCategory.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/ArtifactCategory.java
@@ -19,9 +19,7 @@ package com.google.devtools.build.lib.rules.cpp;
  */
 public enum ArtifactCategory {
   STATIC_LIBRARY("lib%{base_name}.a"),
-  PIC_STATIC_LIBRARY("lib%{base_name}.pic.a"),
   ALWAYSLINK_STATIC_LIBRARY("lib%{base_name}.lo"),
-  ALWAYSLINK_PIC_STATIC_LIBRARY("lib%{base_name}.pic.lo"),
   DYNAMIC_LIBRARY("lib%{base_name}.so"),
   EXECUTABLE("%{base_name}"),
   INTERFACE_LIBRARY("lib%{base_name}.ifso"),
@@ -38,14 +36,10 @@ public enum ArtifactCategory {
 
   private final String defaultPattern;
 
-  private ArtifactCategory(String defaultPattern) {
+  ArtifactCategory(String defaultPattern) {
     this.defaultPattern = defaultPattern;
   }
 
-  private ArtifactCategory() {
-    this.defaultPattern = null;
-  }
-
   /** Returns the name of the category. */
   public String getCategoryName() {
     return this.toString().toLowerCase();