From fda1821bff8d0a0f4eb0c572bfa536a8992dbb9e Mon Sep 17 00:00:00 2001 From: Qingyu Wang <40660121+colinaaa@users.noreply.github.com> Date: Tue, 18 Nov 2025 17:49:18 +0800 Subject: [PATCH] fix(benchx_cli): avoid downloading android_sdk_manager --- .../patches/android_sdk_manager.diff | 31 +++++++++++++++++++ packages/lynx/benchx_cli/scripts/build.mjs | 12 ++----- packages/lynx/benchx_cli/turbo.json | 2 +- 3 files changed, 34 insertions(+), 11 deletions(-) create mode 100644 packages/lynx/benchx_cli/patches/android_sdk_manager.diff diff --git a/packages/lynx/benchx_cli/patches/android_sdk_manager.diff b/packages/lynx/benchx_cli/patches/android_sdk_manager.diff new file mode 100644 index 0000000000..483c7008de --- /dev/null +++ b/packages/lynx/benchx_cli/patches/android_sdk_manager.diff @@ -0,0 +1,31 @@ +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 52da2590e5..816d836374 100644 --- a/packages/lynx/benchx_cli/scripts/build.mjs +++ b/packages/lynx/benchx_cli/scripts/build.mjs @@ -86,15 +86,6 @@ rm -rf habitat rm -rf lynx `; -// We build habitat from source to workaround a bug -await $` -git clone --branch=0.3.142 --depth=1 https://github.com/lynx-family/habitat -cd habitat -uv venv venv -source venv/bin/activate -uv pip install . -`.pipe(process.stdout); - // prepare the lynx repo await $` git clone https://github.com/lynx-family/lynx @@ -104,6 +95,7 @@ git checkout ${COMMIT} git remote add hzy https://github.com/hzy/lynx git fetch hzy ${PICK_COMMIT} git cherry-pick -n ${PICK_COMMIT} +git apply ../patches/android_sdk_manager.diff `.pipe(process.stdout); // hab sync . @@ -113,7 +105,7 @@ uv venv .venv source .venv/bin/activate uv pip install pip source tools/envsetup.sh -../habitat/venv/bin/hab sync . +tools/hab sync . `.pipe(process.stdout); // build from source diff --git a/packages/lynx/benchx_cli/turbo.json b/packages/lynx/benchx_cli/turbo.json index 30ec45e97b..2abc70f64a 100644 --- a/packages/lynx/benchx_cli/turbo.json +++ b/packages/lynx/benchx_cli/turbo.json @@ -6,7 +6,7 @@ "env": ["ECOSYSTEM_CI"], "passThroughEnv": ["ECOSYSTEM_CI"], "dependsOn": [], - "inputs": ["scripts/build.mjs"], + "inputs": ["scripts/build.mjs", "patches/*"], "outputs": ["dist/**"] } }