diff --git a/.changeset/vast-parents-swim.md b/.changeset/vast-parents-swim.md
new file mode 100644
index 0000000000..853d812bb3
--- /dev/null
+++ b/.changeset/vast-parents-swim.md
@@ -0,0 +1,3 @@
+---
+
+---
diff --git a/packages/lynx/benchx_cli/bin/benchx_cli b/packages/lynx/benchx_cli/bin/benchx_cli
new file mode 100755
index 0000000000..be9106e1ce
--- /dev/null
+++ b/packages/lynx/benchx_cli/bin/benchx_cli
@@ -0,0 +1,9 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+if [ ! -f "$basedir/../dist/bin/benchx_cli" ]; then
+  echo "Acting as noop as './dist/bin/benchx_cli' not found. Please run 'CI=1 pnpm build' in packages/lynx/benchx_cli first." >&2
+  exit 0
+fi
+
+exec "$basedir/../dist/bin/benchx_cli" "$@"
diff --git a/packages/lynx/benchx_cli/package.json b/packages/lynx/benchx_cli/package.json
index 85b4f01414..3e21d09d4a 100644
--- a/packages/lynx/benchx_cli/package.json
+++ b/packages/lynx/benchx_cli/package.json
@@ -3,11 +3,10 @@
   "version": "0.0.1",
   "private": true,
   "bin": {
-    "benchx_cli": "./dist/bin/benchx_cli"
+    "benchx_cli": "./bin/benchx_cli"
   },
   "scripts": {
-    "build": "node scripts/build.mjs",
-    "prepare": "node scripts/prepare.mjs"
+    "build": "node scripts/build.mjs"
   },
   "dependencies": {
     "zx": "^8.8.5"
diff --git a/packages/lynx/benchx_cli/patches/android_sdk_manager.diff b/packages/lynx/benchx_cli/patches/android_sdk_manager.diff
deleted file mode 100644
index 483c7008de..0000000000
--- a/packages/lynx/benchx_cli/patches/android_sdk_manager.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/DEPS b/DEPS
-index 2923b5ce9..64d6c7fe1 100644
---- a/DEPS
-+++ b/DEPS
-@@ -136,16 +136,16 @@ deps = {
-         "ignore_in_git": True,
-         "condition": system in ['linux', 'darwin', 'windows']
-     },
--    'buildtools/android_sdk_manager': {
--        "type": "http",
--        "url": {
--            "darwin": "https://dl.google.com/android/repository/commandlinetools-mac-8512546_latest.zip",
--            "linux": "https://dl.google.com/android/repository/commandlinetools-linux-8512546_latest.zip",
--            "windows": "https://dl.google.com/android/repository/commandlinetools-win-8512546_latest.zip"
--        }.get(system, None),
--        "ignore_in_git": True,
--        "condition": system in ['linux', 'darwin', 'windows']
--    },
-+    # 'buildtools/android_sdk_manager': {
-+    #     "type": "http",
-+    #     "url": {
-+    #         "darwin": "https://dl.google.com/android/repository/commandlinetools-mac-8512546_latest.zip",
-+    #         "linux": "https://dl.google.com/android/repository/commandlinetools-linux-8512546_latest.zip",
-+    #         "windows": "https://dl.google.com/android/repository/commandlinetools-win-8512546_latest.zip"
-+    #     }.get(system, None),
-+    #     "ignore_in_git": True,
-+    #     "condition": system in ['linux', 'darwin', 'windows']
-+    # },
-     'third_party/gyp': {
-         "type": "git",
-         "url": "https://chromium.googlesource.com/external/gyp",
diff --git a/packages/lynx/benchx_cli/scripts/build.mjs b/packages/lynx/benchx_cli/scripts/build.mjs
index 816d836374..ce04b4af7e 100644
--- a/packages/lynx/benchx_cli/scripts/build.mjs
+++ b/packages/lynx/benchx_cli/scripts/build.mjs
@@ -34,8 +34,8 @@ console.log('noop')
   process.exit(0);
 }
 
-const COMMIT = 'd6dd806293012c62e5104ad7ed2bed5c66f4f833';
-const PICK_COMMIT = 'ce49dc44c73bb26bb6c1cc56d0ae86fa45cc254c';
+const COMMIT = '25af017a126ed087ba1bf276639f4a0b60b348fc';
+const PICK_COMMIT = '26f5fa8f92c517bce0550c34ff7a43f06c2df705';
 
 function checkCwd() {
   try {
@@ -88,18 +88,20 @@ rm -rf lynx
 
 // prepare the lynx repo
 await $`
-git clone https://github.com/lynx-family/lynx
+mkdir -p lynx
 cd lynx
+git init -b main
+git remote add origin https://github.com/lynx-family/lynx
 git fetch origin ${COMMIT}
 git checkout ${COMMIT}
-git remote add hzy https://github.com/hzy/lynx
-git fetch hzy ${PICK_COMMIT}
+git remote add lynx-community https://github.com/lynx-community/benchx_cli
+git fetch lynx-community ${PICK_COMMIT}
 git cherry-pick -n ${PICK_COMMIT}
-git apply ../patches/android_sdk_manager.diff
 `.pipe(process.stdout);
 
 // hab sync .
 await $`
+set +u
 cd lynx
 uv venv .venv
 source .venv/bin/activate
@@ -110,16 +112,17 @@ tools/hab sync .
 
 // build from source
 await $`
+set +u
 cd lynx
 source tools/envsetup.sh
-gn gen --args='enable_unittests=true enable_trace="perfetto" jsengine_type="quickjs" enable_frozen_mode=true' out/Default
+gn gen --args=${
+  process.platform === 'darwin'
+    ? `enable_unittests=true enable_trace="perfetto" jsengine_type="quickjs" enable_frozen_mode=true use_flutter_cxx=false`
+    : `enable_unittests=true enable_trace="perfetto" jsengine_type="quickjs" enable_frozen_mode=true`
+} out/Default
 ninja -C out/Default benchx_cli
 mkdir -p ../dist/bin
-cp ${
-  process.platform === 'darwin'
-    ? 'out/Default/benchx_cli'
-    : 'out/Default/exe.unstripped/benchx_cli' // linux
-} ../dist/bin/benchx_cli
+cp out/Default/benchx_cli ../dist/bin/benchx_cli
 git rev-parse HEAD > ../dist/bin/benchx_cli.commit
 rm -rf out
 `.pipe(process.stdout);
diff --git a/packages/lynx/benchx_cli/scripts/prepare.mjs b/packages/lynx/benchx_cli/scripts/prepare.mjs
deleted file mode 100644
index cf7ef9d417..0000000000
--- a/packages/lynx/benchx_cli/scripts/prepare.mjs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2025 The Lynx Authors. All rights reserved.
-// Licensed under the Apache License Version 2.0 that can be found in the
-// LICENSE file in the root directory of this source tree.
-
-import { copyFileSync, existsSync, mkdirSync, writeFileSync } from 'node:fs';
-
-mkdirSync('./dist/bin', { recursive: true });
-
-if (existsSync('./dist/bin/benchx_cli')) {
-  // File already exists
-  // eslint-disable-next-line n/no-process-exit
-  process.exit(0);
-}
-
-if (process.platform === 'win32') {
-  writeFileSync(
-    './dist/bin/benchx_cli',
-    `\
-#!/usr/bin/env node
-
-console.log('noop')
-`,
-  );
-} else {
-  copyFileSync('/usr/bin/true', './dist/bin/benchx_cli');
-}