Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

devops: do not compile NaCL for chromium (#12508)

Browse source
This commit is contained in:
Andrey Lushnikov 2022-03-04 15:38:02 -07:00 committed by GitHub
parent e10b39673c
commit d61862094e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
browser_patches/chromium/archive.sh
View file

@ -70,7 +70,7 @@ function archive_compiled_chromium() {
unset IFS unset IFS
elif [[ $1 == "--compile-linux-arm64" ]]; then elif [[ $1 == "--compile-linux-arm64" ]]; then
CHROMIUM_FOLDER_NAME="chrome-linux" CHROMIUM_FOLDER_NAME="chrome-linux"
IFS=$'\n' CHROMIUM_FILES_TO_ARCHIVE=($(node "${SCRIPT_PATH}/compute_files_to_archive.js" "${CR_CHECKOUT_PATH}/src/infra/archive_config/linux-archive-rel.json" --linux-arm64)) IFS=$'\n' CHROMIUM_FILES_TO_ARCHIVE=($(node "${SCRIPT_PATH}/compute_files_to_archive.js" "${CR_CHECKOUT_PATH}/src/infra/archive_config/linux-archive-rel.json"))
unset IFS unset IFS
elif [[ $1 == "--compile-win64" ]]; then elif [[ $1 == "--compile-win64" ]]; then
CHROMIUM_FOLDER_NAME="chrome-win" CHROMIUM_FOLDER_NAME="chrome-win"

1
browser_patches/chromium/build.sh
View file

@ -77,6 +77,7 @@ compile_chromium() {
echo 'use_goma = true' >> ./out/Default/args.gn echo 'use_goma = true' >> ./out/Default/args.gn
echo "goma_dir = \"${PLAYWRIGHT_GOMA_PATH}\"" >> ./out/Default/args.gn echo "goma_dir = \"${PLAYWRIGHT_GOMA_PATH}\"" >> ./out/Default/args.gn
fi fi
echo 'enable_nacl = false' >> ./out/Default/args.gn
echo "===== args.gn =====" echo "===== args.gn ====="
cat ./out/Default/args.gn cat ./out/Default/args.gn

14
browser_patches/chromium/compute_files_to_archive.js
View file

@ -11,20 +11,16 @@ const config = configs.find(config => config.gcs_path.includes('chrome-linux.zip
const excludeList = new Set([ const excludeList = new Set([
// We do not need interactive tests in our archive. // We do not need interactive tests in our archive.
'interactive_ui_tests.exe', 'interactive_ui_tests.exe',
// We no longer compile nacl with Chromium.
'nacl_helper_bootstrap',
'nacl_helper',
'nacl_irt_x86_64.nexe',
]); ]);
// There is no upstream configuration for packaging Linux Arm64 builds,
// so we build one by replacing x86_64-specific nacl binary with arm one.
const replaceMap = {
'--linux-arm64': {
'nacl_irt_x86_64.nexe': 'nacl_irt_arm.nexe',
},
}[process.argv[3]] || {};
const entries = [ const entries = [
...(config.files || []), ...(config.files || []),
...(config.dirs || []), ...(config.dirs || []),
].filter(entry => !excludeList.has(entry)).map(entry => replaceMap[entry] || entry); ].filter(entry => !excludeList.has(entry));
for (const entry of entries) for (const entry of entries)
console.log(entry); console.log(entry);