infra: Fix autoconf executable path

No-Try: true
Bug: 462546993
Change-Id: I57efe76d9b71f4a609fecda4dc223351c70d4a9e
Reviewed-on: https://gn-review.googlesource.com/c/gn/+/20401
Commit-Queue: Junji Watanabe <jwata@google.com>
Reviewed-by: Takuto Ikuta <tikuta@google.com>

infra/recipes/gn.expected/ci_linux.json

diff --git a/infra/recipes/gn.expected/ci_linux.json b/infra/recipes/gn.expected/ci_linux.json
index 0a543df..9a43b9e 100644
--- a/infra/recipes/gn.expected/ci_linux.json
+++ b/infra/recipes/gn.expected/ci_linux.json
@@ -323,7 +323,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/3pp/tools/autoconf/79821582576f6f08410b2d2f2c0658c2be62aae6ca2df4ab28cc6b4d75002f20/autoconf"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/autoconf/79821582576f6f08410b2d2f2c0658c2be62aae6ca2df4ab28cc6b4d75002f20/bin/autoconf"
     ],
     "cwd": "[START_DIR]/jemalloc",
     "infra_step": true,

infra/recipes/gn.expected/cipd_exists.json

diff --git a/infra/recipes/gn.expected/cipd_exists.json b/infra/recipes/gn.expected/cipd_exists.json
index 8058614..6397d57 100644
--- a/infra/recipes/gn.expected/cipd_exists.json
+++ b/infra/recipes/gn.expected/cipd_exists.json
@@ -323,7 +323,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/3pp/tools/autoconf/79821582576f6f08410b2d2f2c0658c2be62aae6ca2df4ab28cc6b4d75002f20/autoconf"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/autoconf/79821582576f6f08410b2d2f2c0658c2be62aae6ca2df4ab28cc6b4d75002f20/bin/autoconf"
     ],
     "cwd": "[START_DIR]/jemalloc",
     "infra_step": true,

infra/recipes/gn.expected/cipd_register.json

diff --git a/infra/recipes/gn.expected/cipd_register.json b/infra/recipes/gn.expected/cipd_register.json
index c7a8327..48611c8 100644
--- a/infra/recipes/gn.expected/cipd_register.json
+++ b/infra/recipes/gn.expected/cipd_register.json
@@ -323,7 +323,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/3pp/tools/autoconf/79821582576f6f08410b2d2f2c0658c2be62aae6ca2df4ab28cc6b4d75002f20/autoconf"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/autoconf/79821582576f6f08410b2d2f2c0658c2be62aae6ca2df4ab28cc6b4d75002f20/bin/autoconf"
     ],
     "cwd": "[START_DIR]/jemalloc",
     "infra_step": true,

infra/recipes/gn.expected/cq_linux.json

diff --git a/infra/recipes/gn.expected/cq_linux.json b/infra/recipes/gn.expected/cq_linux.json
index 0bab23d..6c7164c 100644
--- a/infra/recipes/gn.expected/cq_linux.json
+++ b/infra/recipes/gn.expected/cq_linux.json
@@ -374,7 +374,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/3pp/tools/autoconf/79821582576f6f08410b2d2f2c0658c2be62aae6ca2df4ab28cc6b4d75002f20/autoconf"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/autoconf/79821582576f6f08410b2d2f2c0658c2be62aae6ca2df4ab28cc6b4d75002f20/bin/autoconf"
     ],
     "cwd": "[START_DIR]/jemalloc",
     "infra_step": true,

infra/recipes/gn.py

diff --git a/infra/recipes/gn.py b/infra/recipes/gn.py
index 4ec9287..8123518 100644
--- a/infra/recipes/gn.py
+++ b/infra/recipes/gn.py
@@ -202,10 +202,11 @@
           api.step('checkout', ['git', 'checkout', 'FETCH_HEAD'])
 
           # TODO: We can rely on pre-installed autoconf after the following
-          # change gets rolled out.
-          # https://gn-review.git.corp.google.com/c/gn/+/20200
-          autoconf_path = api.cipd.ensure_tool('infra/3pp/tools/autoconf/${platform}',
-                               "version:3@2.71.chromium.1")
+          # change gets rolled out. https://crrev.com/c/7172045
+          autoconf_path = api.cipd.ensure_tool(
+              'infra/3pp/tools/autoconf/${platform}',
+              "version:3@2.71.chromium.1",
+              executable_path='bin/autoconf')
           api.step('autoconf', [autoconf_path])
 
         for platform in all_config_platforms: