commit 7c40d26f64c1ba8d1e3e03b71de613b4771fc3fc
author hlopko <hlopko@google.com> Wed Jun 12 03:29:12 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Wed Jun 12 03:30:10 2019 -0700
tree 7573592551a68f42d1619465c38db35d10271e61
parent 08d691f40bbe8c6ed28a5ba22798f0cbee595fa7

Cleanup output_object_file

This variable is not used.

RELNOTES: None.
PiperOrigin-RevId: 252793011

src/main/java/com/google/devtools/build/lib/rules/cpp/CompileBuildVariables.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CompileBuildVariables.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CompileBuildVariables.java
index 3eb49bb..41e246e 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CompileBuildVariables.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CompileBuildVariables.java
@@ -25,7 +25,6 @@
 import com.google.devtools.build.lib.rules.cpp.CcToolchainVariables.StringSequenceBuilder;
 import com.google.devtools.build.lib.rules.cpp.CcToolchainVariables.VariablesExtension;
 import com.google.devtools.build.lib.syntax.EvalException;
-import com.google.devtools.build.lib.util.FileType;
 import com.google.devtools.build.lib.vfs.PathFragment;
 
 /** Enum covering all build variables we create for all various {@link CppCompileAction}. */
@@ -39,8 +38,6 @@
   USER_COMPILE_FLAGS("user_compile_flags"),
   /** Variable for flags coming from unfiltered_cxx_flag CROSSTOOL fields. */
   UNFILTERED_COMPILE_FLAGS("unfiltered_compile_flags"),
-  /** Variable for the path to the output file when output is an object file. */
-  OUTPUT_OBJECT_FILE("output_object_file"),
   /** Variable for the path to the compilation output file. */
   OUTPUT_FILE("output_file"),
   /** Variable for the dependency file path */
@@ -168,8 +165,6 @@
       BuildOptions buildOptions,
       CppConfiguration cppConfiguration,
       String sourceFile,
-      // TODO(b/76195763): Remove once blaze with cl/189769259 is released and crosstools are
-      // updated.
       String outputFile,
       String gcnoFile,
       boolean isUsingFission,
@@ -209,20 +204,6 @@
     String fakeOutputFileOrRealOutputFile = fakeOutputFile != null ? fakeOutputFile : outputFile;
 
     if (outputFile != null) {
-      // TODO(b/76195763): Remove once blaze with cl/189769259 is released and crosstools are
-      // updated.
-      if (!FileType.contains(
-          PathFragment.create(outputFile),
-          CppFileTypes.ASSEMBLER,
-          CppFileTypes.PIC_ASSEMBLER,
-          CppFileTypes.PREPROCESSED_C,
-          CppFileTypes.PREPROCESSED_CPP,
-          CppFileTypes.PIC_PREPROCESSED_C,
-          CppFileTypes.PIC_PREPROCESSED_CPP)) {
-        buildVariables.addStringVariable(
-            OUTPUT_OBJECT_FILE.getVariableName(), fakeOutputFileOrRealOutputFile);
-      }
-
       buildVariables.addStringVariable(
           OUTPUT_FILE.getVariableName(), fakeOutputFileOrRealOutputFile);
     }

src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionTemplate.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionTemplate.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionTemplate.java
index efcbed6..2609d32 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionTemplate.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionTemplate.java
@@ -193,9 +193,6 @@
         CompileBuildVariables.OUTPUT_FILE.getVariableName(),
         outputTreeFileArtifact.getExecPathString());
     buildVariables.overrideStringVariable(
-        CompileBuildVariables.OUTPUT_OBJECT_FILE.getVariableName(),
-        outputTreeFileArtifact.getExecPathString());
-    buildVariables.overrideStringVariable(
         CompileBuildVariables.DEPENDENCY_FILE.getVariableName(),
         dotdFileArtifact.getExecPathString());