Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions packages/lynx/benchx_cli/patches/android_sdk_manager.diff
Original file line number Diff line number Diff line change
@@ -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",
12 changes: 2 additions & 10 deletions packages/lynx/benchx_cli/scripts/build.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 .
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/lynx/benchx_cli/turbo.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"env": ["ECOSYSTEM_CI"],
"passThroughEnv": ["ECOSYSTEM_CI"],
"dependsOn": [],
"inputs": ["scripts/build.mjs"],
"inputs": ["scripts/build.mjs", "patches/*"],
"outputs": ["dist/**"]
}
}
Expand Down
Loading