Rollback of commit 45d48bf1fe7503acbbb0c095822b7f8f558881e8.

*** Reason for rollback ***

Breaks //[]/go:all .

*** Original change description ***

Turn the addition of -fPIC to the command line of PIC actions into a feature.

--
MOS_MIGRATED_REVID=122526799

2 files changed, 3 insertions, 33 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java b/src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java
index 66306be004..ae897889da 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java
@@ -13,7 +13,6 @@
 // limitations under the License.
 package com.google.devtools.build.lib.packages.util;
 
-import com.google.common.base.Joiner;
 import com.google.common.base.Predicate;
 import com.google.common.base.Verify;
 import com.google.common.collect.ImmutableList;
@@ -224,10 +223,9 @@ public abstract class MockCcSupport {
    * @param partialToolchain A string representation of a CToolchain protocol buffer; note that
    *        this is allowed to be a partial buffer (required fields may be omitted).
    */
-  public void setupCrosstool(MockToolsConfig config, String... partialToolchain)
-      throws IOException {
+  public void setupCrosstool(MockToolsConfig config, String partialToolchain) throws IOException {
     CToolchain.Builder toolchainBuilder = CToolchain.newBuilder();
-    TextFormat.merge(Joiner.on("\n").join(partialToolchain), toolchainBuilder);
+    TextFormat.merge(partialToolchain, toolchainBuilder);
     setupCrosstool(config, toolchainBuilder.buildPartial());
   }
 
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java
index 974d19d8c4..57a9d62de8 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java
@@ -673,38 +673,10 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase {
   }
 
   @Test
-  public void testPicNotAvailableError() throws Exception {
-    AnalysisMock.get()
-        .ccSupport()
-        .setupCrosstool(mockToolsConfig,
-            "feature { name: 'no_legacy_features' }");
-    useConfiguration();
-    writeSimpleCcLibrary();
-    reporter.removeHandler(failFastHandler);
-    getConfiguredTarget("//module:map");
-    assertContainsEvent("PIC compilation is requested but the toolchain does not support it");
-  }
-
-  @Test
-  public void testToolchainWithoutPicForNoPicCompilation() throws Exception {
-    AnalysisMock.get()
-        .ccSupport()
-        .setupCrosstool(mockToolsConfig,
-            "needsPic: false",
-            "feature { name: 'no_legacy_features' }");
-    useConfiguration();
-    scratchConfiguredTarget("a", "a",
-        "cc_binary(name='a', srcs=['a.cc'], deps=[':b'])",
-        "cc_library(name='b', srcs=['b.cc'])");
-  }
-
-  @Test
   public void testNoCppModuleMap() throws Exception {
     AnalysisMock.get()
         .ccSupport()
-        .setupCrosstool(mockToolsConfig,
-            "feature { name: 'no_legacy_features' }",
-            "feature { name: 'pic' }");
+        .setupCrosstool(mockToolsConfig, "feature { name: 'no_legacy_features' }");
     useConfiguration();
     writeSimpleCcLibrary();
     assertNoCppModuleMapAction("//module:map");