Add incompatible flag for it

Author: keith

src/main/java/com/google/devtools/build/lib/analysis/config/CoreOptions.java

@@ -666,6 +666,15 @@ public OutputDirectoryNamingSchemeConverter() {
               + "Negative features always override positive ones.")
   public List<String> hostFeatures;
 
+  @Option(
+      name = "incompatible_use_host_features",
+      defaultValue = "true",
+      documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS,
+      effectTags = {OptionEffectTag.CHANGES_INPUTS, OptionEffectTag.AFFECTS_OUTPUTS},
+      metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE},
+      help = "If true, use --features only for the target configuration and --host_features for the exec configuration.")
+  public boolean incompatibleUseHostFeatures;
+
   @Option(
       name = "target_environment",
       converter = LabelListConverter.class,
@@ -1002,7 +1011,12 @@ public FragmentOptions getExec() {
     exec.checkLicenses = checkLicenses;
 
     // === Pass on C++ compiler features.
-    exec.defaultFeatures = ImmutableList.copyOf(hostFeatures);
+    exec.incompatibleUseHostFeatures = incompatibleUseHostFeatures;
+    if (incompatibleUseHostFeatures) {
+      exec.defaultFeatures = ImmutableList.copyOf(hostFeatures);
+    } else {
+      exec.defaultFeatures = ImmutableList.copyOf(defaultFeatures);
+    }
 
     // Save host options in case of a further exec->host transition.
     exec.hostCpu = hostCpu;

src/test/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetTest.java

@@ -70,6 +70,17 @@ public void testHostFeatures() throws Exception {
     assertThat(features).doesNotContain("feature");
   }
 
+  @Test
+  public void testHostFeaturesIncompatibleDisabled() throws Exception {
+    useConfiguration("--features=feature", "--host_features=host_feature",
+                     "--incompatible_use_host_features=false");
+    scratch.file("a/BUILD", "cc_library(name = 'a')");
+    ImmutableSet<String> features = getRuleContext(
+        getConfiguredTarget("//a", getExecConfiguration())).getFeatures();
+    assertThat(features).contains("feature");
+    assertThat(features).doesNotContain("host_feature");
+  }
+
   @Test
   public void testFeatureDisabledOnCommandLine() throws Exception {
     useConfiguration("--features=-feature");