commit 17830c25a816d67ba79e783acaa6a085b516bd43
author plf <plf@google.com> Mon Feb 05 04:34:16 2018 -0800
committer Copybara-Service <copybara-piper@google.com> Mon Feb 05 04:35:36 2018 -0800
tree bbec9bf37d927abf93319363efc2118ef26bd888
parent 6c1c0660dd51420160eb1c0f5eac7e67917a231c

C++: Remove last instatiation of CppModel outside CcLibraryHelper.

RELNOTES:none
PiperOrigin-RevId: 184510731

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

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java
index 7691c2e..71d1316 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java
@@ -185,7 +185,6 @@
   private final Predicate<String> coptsFilter;
   private boolean fake;
   private boolean maySaveTemps;
-  private boolean onlySingleOutput;
   private CcCompilationOutputs compilationOutputs;
 
   // link model
@@ -276,17 +275,6 @@
   }
 
   /**
-   * If set, the CppModel only creates a single .o output that can be linked into a dynamic library,
-   * i.e., it never generates both PIC and non-PIC outputs. Otherwise it creates outputs that can be
-   * linked into both static binaries and dynamic libraries (if both require PIC or both require
-   * non-PIC, then it still only creates a single output). Defaults to false.
-   */
-  public CppModel setOnlySingleOutput(boolean onlySingleOutput) {
-    this.onlySingleOutput = onlySingleOutput;
-    return this;
-  }
-
-  /**
    * Whether to create actions for temps. This defaults to false.
    */
   public CppModel setSaveTemps(boolean maySaveTemps) {
@@ -478,7 +466,7 @@
 
     // Either you're only making a dynamic library (onlySingleOutput) or pic should be used
     // in all cases.
-    if (onlySingleOutput || usePicForBinaries) {
+    if (usePicForBinaries) {
       if (picFeatureEnabled) {
         return false;
       }