'Jiaming Li (Gerrit)' via owners-override

unread,

Nov 13, 2025, 4:56:32 PM (2 days ago) Nov 13

to Owners Override

Attention needed from Chase Latta and Owners Override

Jiaming Li has uploaded the change for review

Jiaming Li would like Owners Override to review this change.

Commit message

[cog] Link fx/ffx etc into .jiri_root/bin

Change-Id: Ib9fda52c2ab230a92feab4304d2419bd58fa9ade

Change diff

diff --git a/scripts/cog/prebuilts.py b/scripts/cog/prebuilts.py
index 50147cf..730c91e 100644
--- a/scripts/cog/prebuilts.py
+++ b/scripts/cog/prebuilts.py
@@ -73,13 +73,11 @@
 
     def _write_jiri_manifest(self) -> None:
         """Writes the jiri manifest."""
-        print("Writing jiri manifest.")
-        jiri_manifest = os.path.join(self.cartfs_directory, ".jiri_manifest")
-        try:
-            with open(jiri_manifest, "w") as f:
-                f.write(LOCAL_JIRI_MANIFEST_CONTENT)
-        except Exception as e:
-            print(f"An error occurred while writing jiri manifest file: {e}")
+        self._patch_file(
+            filepath=".jiri_manifest",
+            content=LOCAL_JIRI_MANIFEST_CONTENT,
+            symlink=True,
+        )
 
         print("Copy manifests directory to CartFS.")
         shutil.copytree(
@@ -149,7 +147,6 @@
         for path in [
             "prebuilt",
             ".jiri_root",
-            ".jiri_manifest",
             ".cipd",
             ".fx",
             "integration",
@@ -162,6 +159,43 @@
                 repo_path,
             )
 
+        # Link .jiri_root/bin/{fx, ffx, hermetic-env, fuchsia-vendored-python}
+        # LINT.IfChange
+        self.create_symlink(
+            os.path.join(self.workspace_dir, self.repo_name, "scripts", "fx"),
+            os.path.join(self.cartfs_directory, ".jiri_root/bin/fx"),
+        )
+        self.create_symlink(
+            os.path.join(
+                self.workspace_dir,
+                self.repo_name,
+                "src",
+                "developer",
+                "ffx",
+                "scripts",
+                "ffx",
+            ),
+            os.path.join(self.cartfs_directory, ".jiri_root/bin/ffx"),
+        )
+        self.create_symlink(
+            os.path.join(
+                self.workspace_dir, self.repo_name, "scripts", "hermetic-env"
+            ),
+            os.path.join(self.cartfs_directory, ".jiri_root/bin/hermetic-env"),
+        )
+        self.create_symlink(
+            os.path.join(
+                self.workspace_dir,
+                self.repo_name,
+                "scripts",
+                "fuchsia-vendored-python",
+            ),
+            os.path.join(
+                self.cartfs_directory, ".jiri_root/bin/fuchsia-vendored-python"
+            ),
+        )
+        # LINT.ThenChange(//scripts/devshell/lib/add_symlink_to_bin.sh)
+
     def _patch_file(
         self, filepath: str, content: str, symlink: bool = False
     ) -> None:
diff --git a/scripts/devshell/lib/add_symlink_to_bin.sh b/scripts/devshell/lib/add_symlink_to_bin.sh
index ede6df9..455e737 100755
--- a/scripts/devshell/lib/add_symlink_to_bin.sh
+++ b/scripts/devshell/lib/add_symlink_to_bin.sh
@@ -6,6 +6,7 @@
 devshell_lib_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
 FUCHSIA_DIR="$(dirname $(dirname $(dirname "${devshell_lib_dir}")))"
 
+# LINT.IfChange
 if [[ -d "${FUCHSIA_DIR}/.jiri_root/bin" ]]; then
   rm -f "${FUCHSIA_DIR}/.jiri_root/bin/fx"
   ln -s "../../scripts/fx" "${FUCHSIA_DIR}/.jiri_root/bin/fx"
@@ -19,3 +20,4 @@
   rm -f "${FUCHSIA_DIR}/.jiri_root/bin/fuchsia-vendored-python"
   ln -s "../../scripts/fuchsia-vendored-python" "${FUCHSIA_DIR}/.jiri_root/bin/fuchsia-vendored-python"
 fi
+# LINT.ThenChange(//scripts/cog/prebuilts.py)

Change information

Files:

M scripts/cog/prebuilts.py
M scripts/devshell/lib/add_symlink_to_bin.sh

Change size: M

Delta: 2 files changed, 44 insertions(+), 8 deletions(-)

Open in Gerrit

Related details

Attention is currently required from:

Chase Latta
Owners Override

Submit Requirements:

Code-Owners
Code-Review
Review-Enforcement

Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings.

Gerrit

--
You received this message because you are subscribed to the Google Groups "owners-override" group.
To unsubscribe from this group and stop receiving emails from it, send an email to owners-overri...@fuchsia.dev.
To view this discussion visit https://groups.google.com/a/fuchsia.dev/d/msgid/owners-override/68d75f513375c093856e6cb2534fda75a6dda4d5-HTML%40fuchsia-review.googlesource.com.

unsatisfied_requirement

satisfied_requirement

open

diffy

'Jiaming Li (Gerrit)' via owners-override

unread,

Nov 13, 2025, 4:56:35 PM (2 days ago) Nov 13

to Owners Override, Darren Chan, Chase Latta, GI Try Builder, CQ Bot

Attention needed from Chase Latta and Owners Override

Jiaming Li added 1 comment

Patchset-level comments

File-level comment, Patchset 1 (Latest):

Jiaming Li . resolved

Adding Owners Override as no one owns `scripts/devshell/lib/add_symlink_to_bin.sh`

Open in Gerrit

Related details

Attention is currently required from:

Chase Latta
Owners Override

Submit Requirements:

Code-Owners
Code-Review
Review-Enforcement

Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings.

Gerrit

--
You received this message because you are subscribed to the Google Groups "owners-override" group.
To unsubscribe from this group and stop receiving emails from it, send an email to owners-overri...@fuchsia.dev.

To view this discussion visit https://groups.google.com/a/fuchsia.dev/d/msgid/owners-override/68d75f513375c093856e6cb2534fda75a6dda4d5-EmailReviewComments-HTML%40fuchsia-review.googlesource.com.

unsatisfied_requirement

satisfied_requirement

open

diffy

'Jiaming Li (Gerrit)' via owners-override

unread,

Nov 13, 2025, 4:57:31 PM (2 days ago) Nov 13

to Owners Override, Darren Chan, Chase Latta, GI Try Builder, CQ Bot

Attention needed from Chase Latta and Owners Override

Jiaming Li voted

Commit-Queue	+1
Fuchsia-Auto-Submit	+1

--
You received this message because you are subscribed to the Google Groups "owners-override" group.
To unsubscribe from this group and stop receiving emails from it, send an email to owners-overri...@fuchsia.dev.

To view this discussion visit https://groups.google.com/a/fuchsia.dev/d/msgid/owners-override/eb87f86846de3e870cada32a2e0355fed890d3dd-EmailReviewComments-HTML%40fuchsia-review.googlesource.com.

unsatisfied_requirement

satisfied_requirement

open

diffy

'Chase Latta (Gerrit)' via owners-override

unread,

Nov 13, 2025, 4:57:53 PM (2 days ago) Nov 13

to Jiaming Li, Owners Override, Darren Chan, GI Try Builder, CQ Bot

Attention needed from Jiaming Li and Owners Override

Chase Latta voted Code-Review+2

Code-Review

+2

Open in Gerrit

Related details

Attention is currently required from:

Jiaming Li
Owners Override

Submit Requirements:

Code-Owners
Code-Review
Review-Enforcement

Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings.

Gerrit

--
You received this message because you are subscribed to the Google Groups "owners-override" group.
To unsubscribe from this group and stop receiving emails from it, send an email to owners-overri...@fuchsia.dev.

To view this discussion visit https://groups.google.com/a/fuchsia.dev/d/msgid/owners-override/0cef816f2a8bf371954c4a2e064414ea9b4113e6-EmailReviewComments-HTML%40fuchsia-review.googlesource.com.

unsatisfied_requirement

satisfied_requirement

open

diffy

'Adam Barth (Gerrit)' via owners-override

unread,

Nov 13, 2025, 6:12:52 PM (2 days ago) Nov 13

to Jiaming Li, Chase Latta, Owners Override, Darren Chan, GI Try Builder, CQ Bot

Attention needed from Jiaming Li and Owners Override

Adam Barth voted Code-Review+2

Code-Review

+2

Open in Gerrit

Related details

Attention is currently required from:

Jiaming Li
Owners Override

Submit Requirements:

Code-Owners
Code-Review
Review-Enforcement

Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings.

Gerrit

--
You received this message because you are subscribed to the Google Groups "owners-override" group.
To unsubscribe from this group and stop receiving emails from it, send an email to owners-overri...@fuchsia.dev.

To view this discussion visit https://groups.google.com/a/fuchsia.dev/d/msgid/owners-override/5c3daf20d0132a0cf38c4dba6001ad493254d406-EmailReviewComments-HTML%40fuchsia-review.googlesource.com.

unsatisfied_requirement

satisfied_requirement

open

diffy

'Adam Barth (Gerrit)' via owners-override

unread,

Nov 13, 2025, 6:14:38 PM (2 days ago) Nov 13

to Jiaming Li, Chase Latta, Owners Override, Darren Chan, GI Try Builder, CQ Bot

Attention needed from Jiaming Li and Owners Override

Adam Barth voted and added 1 comment

Votes added by Adam Barth

Owners-Override

+1

1 comment

Patchset-level comments

File-level comment, Patchset 1 (Latest):

Adam Barth . resolved

Can you add an OWNERS file to `//scripts/devshell`? If you're not sure who to put in there, you can add yourself and me.

Open in Gerrit

Related details

Attention is currently required from:

Jiaming Li
Owners Override

Submit Requirements:

Code-Owners

Code-Review
Review-Enforcement

Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings.

Gerrit

--
You received this message because you are subscribed to the Google Groups "owners-override" group.
To unsubscribe from this group and stop receiving emails from it, send an email to owners-overri...@fuchsia.dev.

To view this discussion visit https://groups.google.com/a/fuchsia.dev/d/msgid/owners-override/9c77afcf64cd0194243ef399e28766ac92bde683-EmailReviewComments-HTML%40fuchsia-review.googlesource.com.

satisfied_requirement

open

diffy

'CQ Bot (Gerrit)' via owners-override

unread,

Nov 13, 2025, 6:15:34 PM (2 days ago) Nov 13

to Jiaming Li, Adam Barth, Chase Latta, Owners Override, Darren Chan, GI Try Builder

CQ Bot submitted the change

Change information

Commit message:

[cog] Link fx/ffx etc into .jiri_root/bin

Change-Id: Ib9fda52c2ab230a92feab4304d2419bd58fa9ade

Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/1422516

Reviewed-by: Darren Chan <chand...@google.com>

Reviewed-by: Adam Barth <aba...@google.com>

Commit-Queue: Jiaming Li <liji...@google.com>

Reviewed-by: Chase Latta <chase...@google.com>

Owners-Override: Adam Barth <aba...@google.com>

Fuchsia-Auto-Submit: Jiaming Li <liji...@google.com>

Files:

M scripts/cog/prebuilts.py
M scripts/devshell/lib/add_symlink_to_bin.sh

Change size: M

Delta: 2 files changed, 44 insertions(+), 8 deletions(-)

Branch: refs/heads/main

Submit Requirements:

Code-Review: +2 by Chase Latta, +2 by Adam Barth, +2 by Darren Chan

Open in Gerrit

Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings.

Gerrit

--
You received this message because you are subscribed to the Google Groups "owners-override" group.
To unsubscribe from this group and stop receiving emails from it, send an email to owners-overri...@fuchsia.dev.

To view this discussion visit https://groups.google.com/a/fuchsia.dev/d/msgid/owners-override/c9e4cf65b1a7ca1a260e457fe5beec9af836c58a-HTML%40fuchsia-review.googlesource.com.

open

diffy

satisfied_requirement

'GI Roller (Gerrit)' via owners-override

unread,

Nov 13, 2025, 6:29:26 PM (2 days ago) Nov 13

to Jiaming Li, CQ Bot, Adam Barth, Chase Latta, Owners Override, Darren Chan, GI Try Builder

Message from GI Roller

Change has been successfully rolled: https://turquoise-internal-review.googlesource.com/1086845

Open in Gerrit

Related details

Attention set is empty

Submit Requirements:

Code-Owners
Code-Review
Review-Enforcement

Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings.

Gerrit

--
You received this message because you are subscribed to the Google Groups "owners-override" group.
To unsubscribe from this group and stop receiving emails from it, send an email to owners-overri...@fuchsia.dev.

To view this discussion visit https://groups.google.com/a/fuchsia.dev/d/msgid/owners-override/3e6dbafd3fa49340cd848948edebf15b746bd7ad-EmailReviewComments-HTML%40fuchsia-review.googlesource.com.

satisfied_requirement

open

diffy

Reply all

Reply to author

Forward

[M] Change in fuchsia/fuchsia[main]: [cog] Link fx/ffx etc into .jiri_root/bin

'Jiaming Li (Gerrit)' via owners-override

Jiaming Li has uploaded the change for review

Commit message

Change diff

Change information

Related details

'Jiaming Li (Gerrit)' via owners-override

Jiaming Li added 1 comment

Related details

'Jiaming Li (Gerrit)' via owners-override

Jiaming Li voted

'Chase Latta (Gerrit)' via owners-override

Chase Latta voted Code-Review+2

Related details

'Adam Barth (Gerrit)' via owners-override

Adam Barth voted Code-Review+2

Related details

'Adam Barth (Gerrit)' via owners-override

Adam Barth voted and added 1 comment

Votes added by Adam Barth

1 comment

Related details

'CQ Bot (Gerrit)' via owners-override

CQ Bot submitted the change

Change information

'GI Roller (Gerrit)' via owners-override

Message from GI Roller

Related details