From 56d04303548936cb2dd3b9d4f39e32f156656ced Mon Sep 17 00:00:00 2001
From: laurentlb <laurentlb@google.com>
Date: Fri, 31 May 2019 12:04:33 -0700
Subject: [PATCH] Flip --incompatible_no_support_tools_in_action_inputs

Fixes https://github.com/bazelbuild/bazel/issues/5826

RELNOTES: Flip --incompatible_no_support_tools_in_action_inputs
PiperOrigin-RevId: 250930436
---
 .../devtools/build/lib/packages/StarlarkSemanticsOptions.java   | 2 +-
 .../com/google/devtools/build/lib/syntax/StarlarkSemantics.java | 2 +-
 src/test/py/bazel/native_test.bzl                               | 2 +-
 src/test/shell/bazel/local_repository_test.sh                   | 2 +-
 src/test/shell/integration/py_args_escaping_test.sh             | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java b/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
index eeaa816633589e..6c0e8365e2cb55 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
@@ -450,7 +450,7 @@ public class StarlarkSemanticsOptions extends OptionsBase implements Serializabl
 
   @Option(
       name = "incompatible_no_support_tools_in_action_inputs",
-      defaultValue = "false",
+      defaultValue = "true",
       documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
       effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
       metadataTags = {
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java b/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java
index 2acf95506ae958..fcdd48b0ef4d11 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java
@@ -248,7 +248,7 @@ public static Builder builderWithDefaults() {
           .incompatibleNoAttrLicense(true)
           .incompatibleNoKwargsInBuildFiles(true)
           .incompatibleNoOutputAttrDefault(true)
-          .incompatibleNoSupportToolsInActionInputs(false)
+          .incompatibleNoSupportToolsInActionInputs(true)
           .incompatibleNoTargetOutputGroup(false)
           .incompatibleNoTransitiveLoads(true)
           .incompatibleObjcFrameworkCleanup(true)
diff --git a/src/test/py/bazel/native_test.bzl b/src/test/py/bazel/native_test.bzl
index 4cdafa3af86055..dd86861cec481d 100644
--- a/src/test/py/bazel/native_test.bzl
+++ b/src/test/py/bazel/native_test.bzl
@@ -39,7 +39,7 @@ bat_test = rule(
 def _exe_test_impl(ctx):
     out = ctx.actions.declare_file(ctx.label.name + "." + ctx.file.src.extension)
     ctx.actions.run(
-        inputs = [ctx.file.src],
+        tools = [ctx.file.src],
         outputs = [out],
         executable = "cmd.exe",
         arguments = ["/C", "copy /Y %IN% %OUT%"],
diff --git a/src/test/shell/bazel/local_repository_test.sh b/src/test/shell/bazel/local_repository_test.sh
index 496bc538378095..8c266ae9ba1be2 100755
--- a/src/test/shell/bazel/local_repository_test.sh
+++ b/src/test/shell/bazel/local_repository_test.sh
@@ -696,7 +696,7 @@ EOF
 def impl(ctx):
     ctx.actions.run_shell(
         command = "cat %s > %s" % (ctx.file._dep.path, ctx.outputs.sh.path),
-        inputs = [ctx.file._dep],
+        tools = [ctx.file._dep],
         outputs = [ctx.outputs.sh]
     )
 
diff --git a/src/test/shell/integration/py_args_escaping_test.sh b/src/test/shell/integration/py_args_escaping_test.sh
index 1100275ed7009e..79b0cf80c1ebe4 100755
--- a/src/test/shell/integration/py_args_escaping_test.sh
+++ b/src/test/shell/integration/py_args_escaping_test.sh
@@ -345,7 +345,7 @@ def _impl(ctx):
     tool_inputs, tool_input_mfs = ctx.resolve_tools(tools = [ctx.attr.tool])
     ctx.actions.run(
         outputs = [ctx.outputs.out],
-        inputs = tool_inputs,
+        tools = tool_inputs,
         executable = ctx.executable.tool,
         arguments = [ctx.outputs.out.path, "a", "", "\"b \\\"c", "z"],
         use_default_shell_env = True,