diff --git a/src/main/java/com/google/devtools/build/lib/analysis/AnalysisResult.java b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisResult.java
index 3c63b346de8f85..5ca0e8050e08cc 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/AnalysisResult.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisResult.java
@@ -35,6 +35,7 @@ public final class AnalysisResult {
   private final ImmutableSet<ConfiguredTarget> targetsToBuild;
   @Nullable private final ImmutableList<ConfiguredTarget> targetsToTest;
   private final ImmutableSet<ConfiguredTarget> targetsToSkip;
+  private final ImmutableSet<ConfiguredTarget> targetsToFail;
   @Nullable private final FailureDetail failureDetail;
   private final ActionGraph actionGraph;
   private final ArtifactsToOwnerLabels topLevelArtifactsToOwnerLabels;
@@ -53,6 +54,7 @@ public final class AnalysisResult {
       ImmutableMap<AspectKey, ConfiguredAspect> aspects,
       @Nullable ImmutableList<ConfiguredTarget> targetsToTest,
       ImmutableSet<ConfiguredTarget> targetsToSkip,
+      ImmutableSet<ConfiguredTarget> targetsToFail,
       @Nullable FailureDetail failureDetail,
       ActionGraph actionGraph,
       ArtifactsToOwnerLabels topLevelArtifactsToOwnerLabels,
@@ -68,6 +70,7 @@ public final class AnalysisResult {
     this.aspects = aspects;
     this.targetsToTest = targetsToTest;
     this.targetsToSkip = targetsToSkip;
+    this.targetsToFail = targetsToFail;
     this.failureDetail = failureDetail;
     this.actionGraph = actionGraph;
     this.topLevelArtifactsToOwnerLabels = topLevelArtifactsToOwnerLabels;
@@ -120,6 +123,19 @@ public ImmutableSet<ConfiguredTarget> getTargetsToSkip() {
     return targetsToSkip;
   }
 
+  /**
+   * Returns the configured targets that should not be executed, but were explicitly requested on
+   * the command line.
+   *
+   * <p>This set of targets is disjoint from {@code getTargetsToSkip()}.
+   *
+   * <p>For example: tests that aren't intended for the designated CPU, but were explicitly
+   * specified on the command line.
+   */
+  public ImmutableSet<ConfiguredTarget> getTargetsToFail() {
+    return targetsToFail;
+  }
+
   public ArtifactsToOwnerLabels getTopLevelArtifactsToOwnerLabels() {
     return topLevelArtifactsToOwnerLabels;
   }
@@ -176,6 +192,7 @@ public AnalysisResult withExclusiveTestsAsParallelTests() {
         aspects,
         targetsToTest,
         targetsToSkip,
+        targetsToFail,
         failureDetail,
         actionGraph,
         topLevelArtifactsToOwnerLabels,
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BUILD b/src/main/java/com/google/devtools/build/lib/analysis/BUILD
index 4a976bc11276ce..0904272fccd4db 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BUILD
@@ -326,6 +326,7 @@ java_library(
         ":extra/extra_action_info_file_write_action",
         ":extra_action_artifacts_provider",
         ":file_provider",
+        ":incompatible_platform_provider",
         ":inconsistent_aspect_order_exception",
         ":label_and_location",
         ":label_expander",
@@ -373,6 +374,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/actions:execution_requirements",
         "//src/main/java/com/google/devtools/build/lib/actions:localhost_capacity",
         "//src/main/java/com/google/devtools/build/lib/analysis/platform",
+        "//src/main/java/com/google/devtools/build/lib/analysis/platform:utils",
         "//src/main/java/com/google/devtools/build/lib/analysis/stringtemplate",
         "//src/main/java/com/google/devtools/build/lib/bugreport",
         "//src/main/java/com/google/devtools/build/lib/buildeventstream",
@@ -598,6 +600,7 @@ java_library(
         ":configured_target",
         ":constraints/top_level_constraint_semantics",
         ":extra_action_artifacts_provider",
+        ":incompatible_platform_provider",
         ":make_environment_event",
         ":target_configured_event",
         ":test/coverage_report_action_factory",
@@ -767,6 +770,15 @@ java_library(
     ],
 )
 
+java_library(
+    name = "incompatible_platform_provider",
+    srcs = ["IncompatiblePlatformProvider.java"],
+    deps = [
+        ":transitive_info_provider",
+        "//src/main/java/com/google/devtools/build/lib/concurrent",
+    ],
+)
+
 java_library(
     name = "inconsistent_aspect_order_exception",
     srcs = ["InconsistentAspectOrderException.java"],
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java b/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java
index 14becb7631c234..ebe1223a716f4e 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java
@@ -34,6 +34,7 @@
 import com.google.devtools.build.lib.analysis.config.HostTransition;
 import com.google.devtools.build.lib.analysis.config.RunUnder;
 import com.google.devtools.build.lib.analysis.constraints.ConstraintConstants;
+import com.google.devtools.build.lib.analysis.platform.ConstraintValueInfo;
 import com.google.devtools.build.lib.analysis.test.TestConfiguration;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.packages.Attribute;
@@ -327,6 +328,15 @@ public static RuleClass.Builder commonCoreAndStarlarkAttributes(RuleClass.Builde
                 .dontCheckConstraints()
                 .nonconfigurable(
                     "special logic for constraints and select: see ConstraintSemantics"))
+        /* <!-- #BLAZE_RULE(toolchain).ATTRIBUTE(target_compatible_with) -->
+        A list of <code>constraint_value</code>s that must be satisfied by the target platform in
+        order for this toolchain to be selected for a target building for that platform.
+        <!-- #END_BLAZE_RULE.ATTRIBUTE --> */
+        .add(
+            attr("target_compatible_with", LABEL_LIST)
+                .mandatoryProviders(ConstraintValueInfo.PROVIDER.id())
+                .allowedFileTypes()
+                .nonconfigurable("Logic for target compatibility"))
         .add(
             attr(RuleClass.CONFIG_SETTING_DEPS_ATTRIBUTE, LABEL_LIST)
                 .nonconfigurable("stores configurability keys"))
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
index a8b8df5c1e93e2..2b46fc8ef90749 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
@@ -41,7 +41,6 @@
 import com.google.devtools.build.lib.analysis.config.BuildOptions;
 import com.google.devtools.build.lib.analysis.config.ConfigurationResolver.TopLevelTargetsAndConfigsResult;
 import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException;
-import com.google.devtools.build.lib.analysis.constraints.TopLevelConstraintSemantics;
 import com.google.devtools.build.lib.analysis.test.CoverageReportActionFactory;
 import com.google.devtools.build.lib.analysis.test.CoverageReportActionFactory.CoverageReportActionsWrapper;
 import com.google.devtools.build.lib.analysis.test.InstrumentedFilesInfo;
@@ -211,6 +210,7 @@ public AnalysisResult update(
       TargetPatternPhaseValue loadingResult,
       BuildOptions targetOptions,
       Set<String> multiCpu,
+      List<String> requestedTargetPatterns,
       List<String> aspects,
       AnalysisOptions viewOptions,
       boolean keepGoing,
@@ -428,12 +428,21 @@ public AnalysisResult update(
       logger.atInfo().log(msg);
     }
 
-    Set<ConfiguredTarget> targetsToSkip =
-        new TopLevelConstraintSemantics(
-                skyframeExecutor.getPackageManager(),
-                input -> skyframeExecutor.getConfiguration(eventHandler, input),
-                eventHandler)
-            .checkTargetEnvironmentRestrictions(skyframeAnalysisResult.getConfiguredTargets());
+    ImmutableSet.Builder<ConfiguredTarget> badTargets = ImmutableSet.builder();
+    ImmutableSet.Builder<ConfiguredTarget> badButRequestedTargets = ImmutableSet.builder();
+
+    for (ConfiguredTarget target : skyframeAnalysisResult.getConfiguredTargets()) {
+      if (target.getProvider(IncompatiblePlatformProvider.class) != null) {
+        if (requestedTargetPatterns.contains(target.getLabel().toString())) {
+          badButRequestedTargets.add(target);
+        } else {
+          badTargets.add(target);
+        }
+      }
+    }
+
+    Set<ConfiguredTarget> targetsToSkip = ImmutableSet.copyOf(badTargets.build());
+    Set<ConfiguredTarget> targetsToFail = ImmutableSet.copyOf(badButRequestedTargets.build());
 
     AnalysisResult result =
         createResult(
@@ -445,6 +454,7 @@ public AnalysisResult update(
             viewOptions,
             skyframeAnalysisResult,
             targetsToSkip,
+            targetsToFail,
             topLevelTargetsWithConfigsResult);
     logger.atInfo().log("Finished analysis");
     return result;
@@ -459,6 +469,7 @@ private AnalysisResult createResult(
       AnalysisOptions viewOptions,
       SkyframeAnalysisResult skyframeAnalysisResult,
       Set<ConfiguredTarget> targetsToSkip,
+      Set<ConfiguredTarget> targetsToFail,
       TopLevelTargetsAndConfigsResult topLevelTargetsWithConfigs)
       throws InterruptedException {
     Set<Label> testsToRun = loadingResult.getTestsToRunLabels();
@@ -563,6 +574,7 @@ public ActionAnalysisMetadata getGeneratingAction(Artifact artifact) {
         aspects,
         allTargetsToTest == null ? null : ImmutableList.copyOf(allTargetsToTest),
         ImmutableSet.copyOf(targetsToSkip),
+        ImmutableSet.copyOf(targetsToFail),
         failureDetail,
         actionGraph,
         artifactsToOwnerLabelsBuilder.build(),
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java
index dd0b0ec9c3f43a..129178abf978a2 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java
@@ -26,6 +26,7 @@
 import com.google.devtools.build.lib.actions.FailAction;
 import com.google.devtools.build.lib.actions.MutableActionGraph.ActionConflictException;
 import com.google.devtools.build.lib.analysis.RuleContext.InvalidExecGroupException;
+import com.google.devtools.build.lib.analysis.actions.SymlinkAction;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
 import com.google.devtools.build.lib.analysis.config.ConfigMatchingProvider;
 import com.google.devtools.build.lib.analysis.config.Fragment;
@@ -35,6 +36,8 @@
 import com.google.devtools.build.lib.analysis.configuredtargets.OutputFileConfiguredTarget;
 import com.google.devtools.build.lib.analysis.configuredtargets.PackageGroupConfiguredTarget;
 import com.google.devtools.build.lib.analysis.configuredtargets.RuleConfiguredTarget;
+import com.google.devtools.build.lib.analysis.platform.ConstraintValueInfo;
+import com.google.devtools.build.lib.analysis.platform.PlatformProviderUtils;
 import com.google.devtools.build.lib.analysis.starlark.StarlarkRuleConfiguredTargetUtil;
 import com.google.devtools.build.lib.analysis.test.AnalysisFailure;
 import com.google.devtools.build.lib.analysis.test.AnalysisFailureInfo;
@@ -69,6 +72,7 @@
 import com.google.devtools.build.lib.skyframe.ConfiguredTargetAndData;
 import com.google.devtools.build.lib.skyframe.ConfiguredTargetKey;
 import com.google.devtools.build.lib.util.OrderedSetMultimap;
+import com.google.devtools.build.lib.vfs.PathFragment;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -304,6 +308,49 @@ private ConfiguredTarget createRule(
                     prerequisiteMap.values()))
             .build();
 
+    if (!"toolchain".equals(rule.getRuleClass())) {
+      if (ruleContext.attributes().has("target_compatible_with")) {
+        Iterable<ConstraintValueInfo> constraintValues =
+            PlatformProviderUtils.constraintValues(
+                ruleContext.getPrerequisites("target_compatible_with", TransitionMode.DONT_CHECK));
+        for (ConstraintValueInfo cvi : constraintValues) {
+          if (!ruleContext.targetPlatformHasConstraint(cvi)) {
+            Artifact symlink = ruleContext.createOutputArtifact();
+
+            ruleContext.registerAction(
+                SymlinkAction.toAbsolutePath(
+                    ruleContext.getActionOwner(),
+                    PathFragment.create("/bin/false"),
+                    symlink,
+                    "Faking out " + ruleContext.getLabel()));
+
+            NestedSetBuilder<Artifact> filesToBuildBuilder =
+                NestedSetBuilder.<Artifact>stableOrder().add(symlink);
+            NestedSet<Artifact> filesToBuild = filesToBuildBuilder.build();
+
+            Runfiles.Builder runfilesBuilder =
+                new Runfiles.Builder(
+                    ruleContext.getWorkspaceName(),
+                    ruleContext.getConfiguration().legacyExternalRunfiles());
+            Runfiles runfiles =
+                runfilesBuilder
+                    .addTransitiveArtifacts(filesToBuild)
+                    .addRunfiles(ruleContext, RunfilesProvider.DEFAULT_RUNFILES)
+                    .build();
+            RunfilesSupport runfilesSupport =
+                RunfilesSupport.withExecutable(ruleContext, runfiles, symlink);
+
+            RuleConfiguredTargetBuilder builder = new RuleConfiguredTargetBuilder(ruleContext);
+            builder.setFilesToBuild(filesToBuild);
+            builder.add(IncompatiblePlatformProvider.class, IncompatiblePlatformProvider.simple());
+            builder.add(RunfilesProvider.class, RunfilesProvider.simple(runfiles));
+            builder.setRunfilesSupport(runfilesSupport, symlink);
+            return builder.build();
+          }
+        }
+      }
+    }
+
     List<NestedSet<AnalysisFailure>> analysisFailures = depAnalysisFailures(ruleContext);
     if (!analysisFailures.isEmpty()) {
       return erroredConfiguredTargetWithFailures(ruleContext, analysisFailures);
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/IncompatiblePlatformProvider.java b/src/main/java/com/google/devtools/build/lib/analysis/IncompatiblePlatformProvider.java
new file mode 100644
index 00000000000000..0f857e2bfde494
--- /dev/null
+++ b/src/main/java/com/google/devtools/build/lib/analysis/IncompatiblePlatformProvider.java
@@ -0,0 +1,28 @@
+// Copyright 2020 The Bazel Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.devtools.build.lib.analysis;
+
+import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
+
+@Immutable
+public final class IncompatiblePlatformProvider implements TransitiveInfoProvider {
+  IncompatiblePlatformProvider() {
+    // Nothing to do.
+  }
+
+  public static IncompatiblePlatformProvider simple() {
+    return new IncompatiblePlatformProvider();
+  }
+}
diff --git a/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/build_event_stream.proto b/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/build_event_stream.proto
index 29642df0b7f961..806fa51e4856bb 100644
--- a/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/build_event_stream.proto
+++ b/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/build_event_stream.proto
@@ -543,6 +543,7 @@ enum TestStatus {
   REMOTE_FAILURE = 6;
   FAILED_TO_BUILD = 7;
   TOOL_HALTED_BEFORE_TESTING = 8;
+  SKIPPED = 9;
 }
 
 // Payload on events reporting about individual test action.
diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/AnalysisPhaseRunner.java b/src/main/java/com/google/devtools/build/lib/buildtool/AnalysisPhaseRunner.java
index 5118fe42128145..6e28349285434f 100644
--- a/src/main/java/com/google/devtools/build/lib/buildtool/AnalysisPhaseRunner.java
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/AnalysisPhaseRunner.java
@@ -146,6 +146,19 @@ public static AnalysisResult execute(
                     String.format("Target %s build was skipped.", label),
                     label));
       }
+      for (ConfiguredTarget target : analysisResult.getTargetsToFail()) {
+        BuildConfiguration config =
+            env.getSkyframeExecutor()
+                .getConfiguration(env.getReporter(), target.getConfigurationKey());
+        Label label = target.getLabel();
+        env.getEventBus()
+            .post(
+                new AbortedEvent(
+                    BuildEventIdUtil.targetCompleted(label, config.getEventId()),
+                    AbortReason.ANALYSIS_FAILURE,
+                    String.format("Target %s is incompatible and cannot be built.", label),
+                    label));
+      }
     } else {
       env.getReporter().handle(Event.progress("Loading complete."));
       env.getReporter().post(new NoAnalyzeEvent());
@@ -213,6 +226,7 @@ private static AnalysisResult runAnalysisPhase(
             loadingResult,
             targetOptions,
             multiCpu,
+            request.getTargets(),
             request.getAspects(),
             request.getViewOptions(),
             request.getKeepGoing(),
diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/BuildResultPrinter.java b/src/main/java/com/google/devtools/build/lib/buildtool/BuildResultPrinter.java
index 715f1bd3dae9e2..5af08679bdace3 100644
--- a/src/main/java/com/google/devtools/build/lib/buildtool/BuildResultPrinter.java
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/BuildResultPrinter.java
@@ -86,16 +86,22 @@ void showBuildResult(
       if (targetsToPrint.size() > request.getBuildOptions().maxResultTargets) {
         return;
       }
-      // Filter the targets we care about into two buckets:
+      // Filter the targets we care about into three buckets:
       Collection<ConfiguredTarget> succeeded = new ArrayList<>();
       Collection<ConfiguredTarget> failed = new ArrayList<>();
+      Collection<ConfiguredTarget> skipped = new ArrayList<>();
       Collection<ConfiguredTarget> successfulTargets = result.getSuccessfulTargets();
       for (ConfiguredTarget target : targetsToPrint) {
-        (successfulTargets.contains(target) ? succeeded : failed).add(target);
+        if (configuredTargetsToSkip.contains(target)) {
+          skipped.add(target);
+        } else {
+          (successfulTargets.contains(target) ? succeeded : failed).add(target);
+        }
       }
 
-      // TODO(bazel-team): convert these to a new "SKIPPED" status when ready: b/62191890.
-      failed.addAll(configuredTargetsToSkip);
+      for (ConfiguredTarget target : skipped) {
+        outErr.printErr("Target " + target.getLabel() + " was skipped\n");
+      }
 
       TopLevelArtifactContext context = request.getTopLevelArtifactContext();
       for (ConfiguredTarget target : succeeded) {
diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
index 59ff40d33ce8bf..a62f1dd3794761 100644
--- a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
@@ -368,7 +368,11 @@ void executeBuild(
           analysisResult.getParallelTests(),
           analysisResult.getExclusiveTests(),
           analysisResult.getTargetsToBuild(),
-          analysisResult.getTargetsToSkip(),
+          // Skip targets in getTargetsToFail() also since there's no point in trying to build them.
+          new ImmutableSet.Builder<ConfiguredTarget>()
+              .addAll(analysisResult.getTargetsToSkip())
+              .addAll(analysisResult.getTargetsToFail())
+              .build(),
           analysisResult.getAspectsMap().keySet(),
           executor,
           builtTargets,
@@ -378,6 +382,18 @@ void executeBuild(
           topLevelArtifactContext,
           shouldTrustRemoteArtifacts);
       buildCompleted = true;
+
+      if (analysisResult.getTargetsToFail().size() > 0) {
+        String message = "Some incompatible targets were explicitly requested";
+        throw new BuildFailedException(
+            message,
+            DetailedExitCode.of(
+                FailureDetail.newBuilder()
+                    .setMessage(message)
+                    .setExecution(
+                        Execution.newBuilder().setCode(Code.INCOMPATIBLE_TARGETS_REQUESTED))
+                    .build()));
+      }
     } catch (BuildFailedException | TestExecException e) {
       buildCompleted = true;
       throw e;
diff --git a/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java b/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
index be7a417ef3038b..317b4e83bbadf4 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
@@ -261,6 +261,8 @@ final class RuleErrorException extends Exception {
    */
   public static final String COMPATIBLE_ENVIRONMENT_ATTR = "compatible_with";
 
+  public static final String TARGET_RESTRICTED_TO_ATTR = "target_compatible_with";
+
   /**
    * For Bazel's constraint system: the implicit attribute used to store rule class restriction
    * defaults as specified by {@link Builder#restrictedTo}.
@@ -1405,6 +1407,7 @@ public <TYPE> Builder exemptFromConstraintChecking(String reason) {
       this.supportsConstraintChecking = false;
       attributes.remove(RuleClass.COMPATIBLE_ENVIRONMENT_ATTR);
       attributes.remove(RuleClass.RESTRICTED_ENVIRONMENT_ATTR);
+      attributes.remove(RuleClass.TARGET_RESTRICTED_TO_ATTR);
       return this;
     }
 
diff --git a/src/main/java/com/google/devtools/build/lib/rules/platform/Toolchain.java b/src/main/java/com/google/devtools/build/lib/rules/platform/Toolchain.java
index 9a595950021243..2ca89cdb11f707 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/platform/Toolchain.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/platform/Toolchain.java
@@ -47,8 +47,7 @@ public ConfiguredTarget create(RuleContext ruleContext)
                 ToolchainRule.EXEC_COMPATIBLE_WITH_ATTR, TransitionMode.DONT_CHECK));
     Iterable<ConstraintValueInfo> targetConstraints =
         PlatformProviderUtils.constraintValues(
-            ruleContext.getPrerequisites(
-                ToolchainRule.TARGET_COMPATIBLE_WITH_ATTR, TransitionMode.DONT_CHECK));
+            ruleContext.getPrerequisites("target_compatible_with", TransitionMode.DONT_CHECK));
     Label toolchainLabel =
         ruleContext.attributes().get(ToolchainRule.TOOLCHAIN_ATTR, BuildType.NODEP_LABEL);
 
@@ -68,7 +67,7 @@ public ConfiguredTarget create(RuleContext ruleContext)
       }
       if (e.targetConstraintsException() != null) {
         ruleContext.attributeError(
-            ToolchainRule.TARGET_COMPATIBLE_WITH_ATTR, e.targetConstraintsException().getMessage());
+            "target_compatible_with", e.targetConstraintsException().getMessage());
       }
       // One of the above must have been non-null, so we just return early.
       return null;
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/AggregatingTestListener.java b/src/main/java/com/google/devtools/build/lib/runtime/AggregatingTestListener.java
index 62be54b78015d7..5d1b1321f9eae4 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/AggregatingTestListener.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/AggregatingTestListener.java
@@ -140,21 +140,40 @@ private void targetFailure(ConfiguredTargetKey configuredTargetKey) {
     }
   }
 
+  private void targetSkipped(ConfiguredTargetKey configuredTargetKey) {
+    TestResultAggregator aggregator = aggregators.get(configuredTargetKey);
+    if (aggregator != null) {
+      aggregator.targetSkipped();
+    }
+  }
+
   @VisibleForTesting
   void buildComplete(
-      Collection<ConfiguredTarget> actualTargets, Collection<ConfiguredTarget> successfulTargets) {
+      Collection<ConfiguredTarget> actualTargets,
+      Collection<ConfiguredTarget> skippedTargets,
+      Collection<ConfiguredTarget> successfulTargets) {
     if (actualTargets == null || successfulTargets == null) {
       return;
     }
 
+    ImmutableSet<ConfiguredTarget> nonSuccessfulTargets =
+        Sets.difference(ImmutableSet.copyOf(actualTargets), ImmutableSet.copyOf(successfulTargets))
+            .immutableCopy();
     for (ConfiguredTarget target :
         Sets.difference(
-            ImmutableSet.copyOf(actualTargets), ImmutableSet.copyOf(successfulTargets))) {
+            ImmutableSet.copyOf(nonSuccessfulTargets), ImmutableSet.copyOf(skippedTargets))) {
       if (isAlias(target)) {
         continue;
       }
       targetFailure(asKey(target));
     }
+
+    for (ConfiguredTarget target : skippedTargets) {
+      if (isAlias(target)) {
+        continue;
+      }
+      targetSkipped(asKey(target));
+    }
   }
 
   @Subscribe
@@ -164,7 +183,8 @@ public void buildCompleteEvent(BuildCompleteEvent event) {
       blazeHalted = true;
     }
     skipTargetsOnFailure = result.getStopOnFirstFailure();
-    buildComplete(result.getActualTargets(), result.getSuccessfulTargets());
+    buildComplete(
+        result.getActualTargets(), result.getSkippedTargets(), result.getSuccessfulTargets());
   }
 
   @Subscribe
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BuildEventStreamerUtils.java b/src/main/java/com/google/devtools/build/lib/runtime/BuildEventStreamerUtils.java
index fc0f161e5a145c..8b15084bb843e1 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BuildEventStreamerUtils.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BuildEventStreamerUtils.java
@@ -45,6 +45,8 @@ public static TestStatus bepStatus(BlazeTestStatus status) {
         return BuildEventStreamProtos.TestStatus.REMOTE_FAILURE;
       case BLAZE_HALTED_BEFORE_TESTING:
         return BuildEventStreamProtos.TestStatus.TOOL_HALTED_BEFORE_TESTING;
+      case SKIPPED:
+        return BuildEventStreamProtos.TestStatus.SKIPPED;
       default:
         // Not used as the above is a complete case distinction; however, by the open
         // nature of protobuf enums, we need the clause to convice java, that we always
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/TerminalTestResultNotifier.java b/src/main/java/com/google/devtools/build/lib/runtime/TerminalTestResultNotifier.java
index e05d7622a17136..bc6dba2acdcd4d 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/TerminalTestResultNotifier.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/TerminalTestResultNotifier.java
@@ -56,6 +56,7 @@ private static class TestResultStats {
     int failedRemotelyCount;
     int failedLocallyCount;
     int noStatusCount;
+    int skippedCount;
     int numberOfExecutedTargets;
     boolean wasUnreportedWrongSize;
 
@@ -213,6 +214,8 @@ public void notify(Set<TestSummary> summaries, int numberOfExecutedTargets) {
         stats.passCount++;
       } else if (summary.getStatus() == BlazeTestStatus.NO_STATUS) {
         stats.noStatusCount++;
+      } else if (summary.getStatus() == BlazeTestStatus.SKIPPED) {
+        stats.skippedCount++;
       } else if (summary.getStatus() == BlazeTestStatus.FAILED_TO_BUILD) {
         stats.failedToBuildCount++;
       } else if (summary.ranRemotely()) {
@@ -311,8 +314,10 @@ private void printStats(TestResultStats stats) {
       addFailureToErrorList(results, "to build", stats.failedToBuildCount);
       addFailureToErrorList(results, "locally", stats.failedLocallyCount);
       addFailureToErrorList(results, "remotely", stats.failedRemotelyCount);
-      addToErrorList(results, "was", "were", "skipped", stats.noStatusCount);
-      printer.print(String.format("\nExecuted %d out of %d %s: %s.\n",
+      addToErrorList(results, "was", "were", "skipped", stats.noStatusCount + stats.skippedCount);
+      printer.print(
+          String.format(
+              "\nExecuted %d out of %d %s: %s.\n",
               stats.numberOfExecutedTargets,
               stats.numberOfTargets,
               stats.numberOfTargets == 1 ? "test" : "tests",
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/TestResultAggregator.java b/src/main/java/com/google/devtools/build/lib/runtime/TestResultAggregator.java
index 6650bcb2ec1a17..ced1850c37bc10 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/TestResultAggregator.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/TestResultAggregator.java
@@ -150,6 +150,21 @@ synchronized void targetFailure(boolean blazeHalted, boolean skipTargetsOnFailur
     policy.eventBus.post(summary.build());
   }
 
+  synchronized void targetSkipped() {
+    if (remainingRuns.isEmpty()) {
+      // Blaze does not guarantee that BuildResult.getSuccessfulTargets() and posted TestResult
+      // events are in sync. Thus, it is possible that a test event was posted, but the target is
+      // not present in the set of successful targets.
+      return;
+    }
+
+    summary.setStatus(BlazeTestStatus.SKIPPED);
+
+    // These are never going to run; removing them marks the target complete.
+    remainingRuns.clear();
+    policy.eventBus.post(summary.build());
+  }
+
   /** Returns the known aggregate results for the given target at the current moment. */
   synchronized TestSummary.Builder getCurrentSummaryForTesting() {
     return summary;
@@ -342,6 +357,8 @@ private void markUnbuilt(boolean blazeHalted, boolean skipTargetsOnFailure) {
                 ? BlazeTestStatus.NO_STATUS
                 : BlazeTestStatus.FAILED_TO_BUILD);
 
+    // TODO(philsc): Explicitly requested incompatible targets are given
+    // NO_STATUS here. Should this be FAILED_TO_BUILD instead?
     summary.setStatus(runStatus);
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/UiEventHandler.java b/src/main/java/com/google/devtools/build/lib/runtime/UiEventHandler.java
index 161d72df735081..287689cd33f016 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/UiEventHandler.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/UiEventHandler.java
@@ -866,7 +866,8 @@ private boolean testSummaryProvidesNewInformation(TestSummary summary) {
             BlazeTestStatus.PASSED,
             BlazeTestStatus.FAILED_TO_BUILD,
             BlazeTestStatus.BLAZE_HALTED_BEFORE_TESTING,
-            BlazeTestStatus.NO_STATUS);
+            BlazeTestStatus.NO_STATUS,
+            BlazeTestStatus.SKIPPED);
 
     if (statusToIgnore.contains(summary.getStatus())) {
       return false;
diff --git a/src/main/protobuf/failure_details.proto b/src/main/protobuf/failure_details.proto
index 656be6a591b63a..3a107ee1c9d584 100644
--- a/src/main/protobuf/failure_details.proto
+++ b/src/main/protobuf/failure_details.proto
@@ -414,6 +414,7 @@ message Execution {
     CYCLE = 35 [(metadata) = { exit_code: 1 }];
     SOURCE_INPUT_MISSING = 36 [(metadata) = { exit_code: 1 }];
     UNEXPECTED_EXCEPTION = 37 [(metadata) = { exit_code: 1 }];
+    INCOMPATIBLE_TARGETS_REQUESTED = 38 [(metadata) = { exit_code: 1 }];
   }
 
   Code code = 1;
diff --git a/src/main/protobuf/test_status.proto b/src/main/protobuf/test_status.proto
index 72cb268607f0c0..95f9a2775aea63 100644
--- a/src/main/protobuf/test_status.proto
+++ b/src/main/protobuf/test_status.proto
@@ -41,6 +41,7 @@ enum BlazeTestStatus {
   REMOTE_FAILURE = 6;
   FAILED_TO_BUILD = 7;
   BLAZE_HALTED_BEFORE_TESTING = 8;
+  SKIPPED = 9;
 };
 
 // TestCase contains detailed data about all tests (cases/suites/decorators)
diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD
index ca9ceb9df1088a..bbb79ab3d831dc 100644
--- a/src/test/shell/bazel/BUILD
+++ b/src/test/shell/bazel/BUILD
@@ -1211,6 +1211,13 @@ sh_test(
     tags = ["no_windows"],
 )
 
+sh_test(
+    name = "target_compatible_with_test",
+    srcs = ["target_compatible_with_test.sh"],
+    data = [":test-deps"],
+    deps = ["@bazel_tools//tools/bash/runfiles"],
+)
+
 sh_test(
     name = "resource_compiler_toolchain_test",
     srcs = ["resource_compiler_toolchain_test.sh"],
diff --git a/src/test/shell/bazel/target_compatible_with_test.sh b/src/test/shell/bazel/target_compatible_with_test.sh
new file mode 100755
index 00000000000000..62666af74fe605
--- /dev/null
+++ b/src/test/shell/bazel/target_compatible_with_test.sh
@@ -0,0 +1,301 @@
+#!/bin/bash
+
+# --- begin runfiles.bash initialization ---
+set -euo pipefail
+if [[ ! -d "${RUNFILES_DIR:-/dev/null}" && ! -f "${RUNFILES_MANIFEST_FILE:-/dev/null}" ]]; then
+  if [[ -f "$0.runfiles_manifest" ]]; then
+    export RUNFILES_MANIFEST_FILE="$0.runfiles_manifest"
+  elif [[ -f "$0.runfiles/MANIFEST" ]]; then
+    export RUNFILES_MANIFEST_FILE="$0.runfiles/MANIFEST"
+  elif [[ -f "$0.runfiles/bazel_tools/tools/bash/runfiles/runfiles.bash" ]]; then
+    export RUNFILES_DIR="$0.runfiles"
+  fi
+fi
+if [[ -f "${RUNFILES_DIR:-/dev/null}/bazel_tools/tools/bash/runfiles/runfiles.bash" ]]; then
+  source "${RUNFILES_DIR}/bazel_tools/tools/bash/runfiles/runfiles.bash"
+elif [[ -f "${RUNFILES_MANIFEST_FILE:-/dev/null}" ]]; then
+  source "$(grep -m1 "^bazel_tools/tools/bash/runfiles/runfiles.bash " \
+            "$RUNFILES_MANIFEST_FILE" | cut -d ' ' -f 2-)"
+else
+  echo >&2 "ERROR: cannot find @bazel_tools//tools/bash/runfiles:runfiles.bash"
+  exit 1
+fi
+# --- end runfiles.bash initialization ---
+
+source "$(rlocation "io_bazel/src/test/shell/integration_test_setup.sh")" \
+  || { echo "integration_test_setup.sh not found!" >&2; exit 1; }
+
+# `uname` returns the current platform, e.g "MSYS_NT-10.0" or "Linux".
+# `tr` converts all upper case letters to lower case.
+# `case` matches the result if the `uname | tr` expression to string prefixes
+# that use the same wildcards as names do in Bash, i.e. "msys*" matches strings
+# starting with "msys", and "*" matches everything (it's the default case).
+case "$(uname -s | tr [:upper:] [:lower:])" in
+msys*)
+  # As of 2019-01-15, Bazel on Windows only supports MSYS Bash.
+  declare -r is_windows=true
+  ;;
+*)
+  declare -r is_windows=false
+  ;;
+esac
+
+function set_up() {
+  mkdir -p target_skipping || fail "couldn't create directory"
+  cat <<EOT > target_skipping/pass.sh || fail "couldn't create pass.sh"
+#!/bin/bash
+exit 0
+EOT
+  chmod +x target_skipping/pass.sh
+
+  cat <<EOT > target_skipping/fail.sh || fail "couldn't create fail.sh"
+#!/bin/bash
+exit 1
+EOT
+  chmod +x target_skipping/fail.sh
+
+  cat <<EOT > target_skipping/BUILD || fail "couldn't create BUILD file"
+constraint_setting(name = "foo_version")
+
+constraint_value(
+    name = "foo1",
+    constraint_setting = ":foo_version",
+)
+
+constraint_value(
+    name = "foo2",
+    constraint_setting = ":foo_version",
+)
+
+constraint_value(
+    name = "foo3",
+    constraint_setting = ":foo_version",
+)
+
+constraint_setting(name = "bar_version")
+
+constraint_value(
+    name = "bar1",
+    constraint_setting = "bar_version",
+)
+
+constraint_value(
+    name = "bar2",
+    constraint_setting = "bar_version",
+)
+
+# TODO(phil): Use more generic constraints for os and cpu.
+platform(
+    name = "foo1_bar1_platform",
+    constraint_values = [
+        "@platforms//os:linux",
+        "@platforms//cpu:x86_64",
+        ":foo1",
+        ":bar1",
+    ],
+)
+
+platform(
+    name = "foo2_bar1_platform",
+    constraint_values = [
+        "@platforms//os:linux",
+        "@platforms//cpu:x86_64",
+        ":foo2",
+        ":bar1",
+    ],
+)
+
+platform(
+    name = "foo1_bar2_platform",
+    constraint_values = [
+        "@platforms//os:linux",
+        "@platforms//cpu:x86_64",
+        ":foo1",
+        ":bar2",
+    ],
+)
+
+platform(
+    name = "foo3_platform",
+    constraint_values = [
+        "@platforms//os:linux",
+        "@platforms//cpu:x86_64",
+        ":foo3",
+    ],
+)
+
+sh_test(
+    name = "pass_on_foo1",
+    srcs = [":pass.sh"],
+    target_compatible_with = [":foo1"],
+)
+
+sh_test(
+    name = "fail_on_foo2",
+    srcs = [":fail.sh"],
+    target_compatible_with = [":foo2"],
+)
+
+sh_test(
+    name = "pass_on_foo1_bar2",
+    srcs = [":pass.sh"],
+    target_compatible_with = [
+        ":foo1",
+        ":bar2",
+    ],
+)
+
+sh_binary(
+    name = "some_foo3_target",
+    srcs = [":pass.sh"],
+    target_compatible_with = [
+        ":foo3",
+    ],
+)
+EOT
+
+  cat <<EOT > target_skipping/WORKSPACE || fail "couldn't create WORKSPACE"
+EOT
+}
+
+function test_console_log_for_builds() {
+  cd target_skipping || fail "couldn't cd into workspace"
+
+  if ! bazel build --show_result=10 --host_platform=@//:foo3_platform \
+    --platforms=@//:foo3_platform ... &> "${TEST_log}"; then
+    cat "${TEST_log}"
+    fail "Bazel failed the test."
+  fi
+
+  cp "${TEST_log}" "${TEST_UNDECLARED_OUTPUTS_DIR}"/
+
+  expect_log 'Target //:some_foo3_target up-to-date'
+  expect_log 'Target //:fail_on_foo2 was skipped'
+  expect_log 'Target //:pass_on_foo1 was skipped'
+  expect_log 'Target //:pass_on_foo1_bar2 was skipped'
+  expect_not_log 'Target //:fail_on_foo2 failed to build'
+  expect_not_log 'Target //:pass_on_foo1 failed to build'
+  expect_not_log 'Target //:pass_on_foo1_bar2 failed to build'
+  expect_not_log 'Target //:fail_on_foo2 up-to-date'
+  expect_not_log 'Target //:pass_on_foo1 up-to-date'
+  expect_not_log 'Target //:pass_on_foo1_bar2 up-to-date'
+}
+
+function test_console_log_for_tests() {
+  cd target_skipping || fail "couldn't cd into workspace"
+
+  # Get repeatable results from this test.
+  bazel clean --expunge
+
+  if ! bazel test --host_platform=@//:foo1_bar1_platform \
+    --platforms=@//:foo1_bar1_platform ... &> "${TEST_log}"; then
+    cat "${TEST_log}"
+    fail "Bazel failed unexpectedly."
+  fi
+  expect_log 'Executed 1 out of 3 tests: 1 test passes and 2 were skipped'
+  expect_log '^//:pass_on_foo1  *  PASSED in'
+  expect_log '^//:fail_on_foo2  *  SKIPPED$'
+  expect_log '^//:pass_on_foo1_bar2  *  SKIPPED$'
+
+  if bazel test --host_platform=@//:foo2_bar1_platform \
+    --platforms=@//:foo2_bar1_platform ... &> "${TEST_log}"; then
+    cat "${TEST_log}"
+    fail "Bazel passed unexpectedly."
+  fi
+  expect_log 'Executed 1 out of 3 tests: 1 fails locally and 2 were skipped.'
+  expect_log '^//:pass_on_foo1  *  SKIPPED$'
+  expect_log '^//:fail_on_foo2  *  FAILED in'
+  expect_log '^//:pass_on_foo1_bar2  *  SKIPPED$'
+
+  # Use :all for this one to validate similar behaviour.
+  if ! bazel test --host_platform=@//:foo1_bar2_platform \
+    --platforms=@//:foo1_bar2_platform :all &> "${TEST_log}"; then
+    cat "${TEST_log}"
+    fail "Bazel failed unexpectedly."
+  fi
+  expect_log 'Executed 2 out of 3 tests: 2 tests pass and 1 was skipped'
+  expect_log '^//:pass_on_foo1  *  PASSED in'
+  expect_log '^//:fail_on_foo2  *  SKIPPED$'
+  expect_log '^//:pass_on_foo1_bar2  *  PASSED in'
+}
+
+function test_failure_on_incompatible_top_level_target() {
+  cd target_skipping || fail "couldn't cd into workspace"
+
+  if bazel test --show_result=10 --host_platform=@//:foo1_bar1_platform \
+    --platforms=@//:foo1_bar1_platform //:pass_on_foo1_bar2 \
+    --build_event_text_file="${TEST_log}".build.json \
+    &> "${TEST_log}"; then
+    fail "Bazel passed unexpectedly."
+  fi
+
+  expect_log '^Target //:pass_on_foo1_bar2 failed to build'
+  expect_log '^ERROR: Some incompatible targets were explicitly requested$'
+  expect_log '^FAILED: Build did NOT complete successfully'
+  expect_log '^//:pass_on_foo1_bar2  *  NO STATUS$'
+
+  # Now look at the build event log.
+  mv "${TEST_log}".build.json "${TEST_log}"
+
+  expect_log "^  reason: ANALYSIS_FAILURE$"
+  expect_log "Target //:pass_on_foo1_bar2 is incompatible and cannot be built."
+
+  # Run an additional (passing) test and make sure we still fail the build.
+  if bazel test --show_result=10 --host_platform=@//:foo1_bar1_platform \
+    --platforms=@//:foo1_bar1_platform //:pass_on_foo1_bar2 //:pass_on_foo1 \
+    &> "${TEST_log}"; then
+    fail "Bazel passed unexpectedly."
+  fi
+
+  expect_log '^//:pass_on_foo1  *  PASSED in'
+  expect_log '^ERROR: Some incompatible targets were explicitly requested$'
+  expect_log '^FAILED: Build did NOT complete successfully'
+}
+
+function test_build_event_protocol() {
+  cd target_skipping || fail "couldn't cd into workspace"
+
+  if ! bazel test --show_result=10 --host_platform=@//:foo1_bar1_platform \
+    --build_event_text_file=$TEST_log \
+    --platforms=@//:foo1_bar1_platform ...; then
+    cat "${TEST_log}"
+    fail "Bazel failed unexpectedly."
+  fi
+  expect_not_log 'Target //:pass_on_foo1 build was skipped\.'
+  expect_log_n 'reason: SKIPPED\>' 3
+  expect_log 'Target //:fail_on_foo2 build was skipped\.'
+  expect_log 'Target //:pass_on_foo1_bar2 build was skipped\.'
+}
+
+function test_non_top_level_skipping() {
+  # TODO(phil): We still build dependencies even if they're incompatible. This
+  # needs to be fixed in a future patch.
+  cat >> target_skipping/BUILD <<EOT
+genrule(
+    name = "genrule_foo1",
+    target_compatible_with = [":foo1"],
+    outs = ["foo1.sh"],
+    cmd = "echo 'Should not be executed' &>2; exit 1",
+)
+
+sh_binary(
+    name = "sh_foo2",
+    srcs = ["foo1.sh"],
+    target_compatible_with = [":foo2"],
+)
+EOT
+
+  cd target_skipping || fail "couldn't cd into workspace"
+
+  if bazel build --show_result=10 --host_platform=@//:foo2_bar1_platform \
+    --platforms=@//:foo2_bar1_platform //:sh_foo2 &> "${TEST_log}"; then
+    cat "${TEST_log}"
+    fail "Bazel passed unexpectedly."
+  fi
+  expect_log 'FAILED: Build did NOT complete successfully'
+  # TODO(phil): We should not see the this message at all. The build should be
+  # skipped altogether.
+  expect_log 'Should not be executed'
+}
+
+run_suite "target_compatible_with tests"