mirror of
https://github.com/browseros-ai/BrowserOS.git
synced 2026-05-20 04:21:23 +00:00
bb62213e84
* fix: install linux sysroot in configure, not via gclient hook `gn gen` was failing on the arm64 leg with `Missing sysroot (//build/linux/debian_bullseye_arm64-sysroot)`. The previous design relied on `git_setup` writing `target_cpus` to `.gclient` so that `gclient sync`'s DEPS hook would download the cross-arch sysroot. That chain breaks for any chromium_src that was synced before cross-arch support landed (the hook is gated on .gclient state at sync time) and for partial pipeline runs that skip git_setup entirely. Nothing in configure declared or verified its sysroot precondition. Make configure self-healing: on Linux, invoke `build/linux/sysroot_scripts/install-sysroot.py --arch=<target>` directly before `gn gen`. install-sysroot.py is idempotent (stamp file + SHA check), fast when already installed, and decoupled from .gclient — it's exactly what the failing assertion's error message recommends. The script accepts our arch names directly: `x64` translates to `amd64` internally via ARCH_TRANSLATIONS, and `arm64` is a valid pass-through. Also temporarily pin release.linux.yaml to x64 only while we validate the sysroot bootstrap end-to-end. Flip back to `[x64, arm64]` once arm64 is green. * chore: pin release.linux.yaml to arm64-only for sysroot bootstrap test x64 already builds cleanly — the failing leg is arm64 cross-compile from an x64 host. Pin the config to arm64 to exercise the new install-sysroot.py path in configure without burning time on x64. Flip back to [x64, arm64] once arm64 is green.
89 lines
3.2 KiB
Python
Generated
89 lines
3.2 KiB
Python
Generated
#!/usr/bin/env python3
|
|
"""Build configuration module for BrowserOS build system"""
|
|
|
|
import sys
|
|
|
|
from ...common.module import CommandModule, ValidationError
|
|
from ...common.context import Context
|
|
from ...common.utils import (
|
|
run_command,
|
|
log_info,
|
|
log_warning,
|
|
log_success,
|
|
join_paths,
|
|
IS_LINUX,
|
|
IS_WINDOWS,
|
|
)
|
|
|
|
|
|
class ConfigureModule(CommandModule):
|
|
produces = []
|
|
requires = []
|
|
description = "Configure build with GN"
|
|
|
|
def validate(self, ctx: Context) -> None:
|
|
if not ctx.chromium_src.exists():
|
|
raise ValidationError(f"Chromium source not found: {ctx.chromium_src}")
|
|
|
|
if not ctx.paths.gn_flags_file:
|
|
raise ValidationError("GN flags file not set")
|
|
|
|
flags_file = join_paths(ctx.root_dir, ctx.paths.gn_flags_file)
|
|
if not flags_file.exists():
|
|
raise ValidationError(f"GN flags file not found: {flags_file}")
|
|
|
|
def execute(self, ctx: Context) -> None:
|
|
log_info(f"\n⚙️ Configuring {ctx.build_type} build for {ctx.architecture}...")
|
|
|
|
# Linux: ensure the target-arch Debian sysroot is installed before
|
|
# `gn gen`. sysroot.gni asserts on missing sysroots, and relying on
|
|
# `gclient sync` DEPS hooks is fragile — the hook only fires when
|
|
# .gclient declared the right `target_cpus` *before* sync, which
|
|
# isn't guaranteed for chromium_src checkouts that predate
|
|
# cross-arch support. install-sysroot.py is idempotent and fast,
|
|
# so call it unconditionally for the target arch.
|
|
if IS_LINUX():
|
|
self._ensure_linux_sysroot(ctx)
|
|
|
|
out_path = join_paths(ctx.chromium_src, ctx.out_dir)
|
|
out_path.mkdir(parents=True, exist_ok=True)
|
|
|
|
flags_file = join_paths(ctx.root_dir, ctx.paths.gn_flags_file)
|
|
args_file = ctx.get_gn_args_file()
|
|
|
|
args_content = flags_file.read_text()
|
|
args_content += f'\ntarget_cpu = "{ctx.architecture}"\n'
|
|
|
|
args_file.write_text(args_content)
|
|
|
|
gn_cmd = "gn.bat" if IS_WINDOWS() else "gn"
|
|
gn_args = [gn_cmd, "gen", ctx.out_dir]
|
|
if ctx.build_type != "debug":
|
|
gn_args.append("--fail-on-unused-args")
|
|
run_command(gn_args, cwd=ctx.chromium_src)
|
|
|
|
log_success("Build configured")
|
|
|
|
def _ensure_linux_sysroot(self, ctx: Context) -> None:
|
|
install_script = (
|
|
ctx.chromium_src / "build" / "linux" / "sysroot_scripts" / "install-sysroot.py"
|
|
)
|
|
if not install_script.exists():
|
|
log_warning(
|
|
f"⚠️ install-sysroot.py not found at {install_script}; "
|
|
f"skipping sysroot bootstrap. gn gen will fail if the "
|
|
f"{ctx.architecture} sysroot is missing."
|
|
)
|
|
return
|
|
|
|
# install-sysroot.py accepts our arch names directly: it translates
|
|
# `x64`→`amd64` internally via ARCH_TRANSLATIONS, and `arm64` is a
|
|
# valid pass-through value.
|
|
log_info(
|
|
f"📦 Ensuring Linux sysroot for {ctx.architecture} (idempotent)..."
|
|
)
|
|
run_command(
|
|
[sys.executable, str(install_script), f"--arch={ctx.architecture}"],
|
|
cwd=ctx.chromium_src,
|
|
)
|