chromiumBeta: Fix the configuration phase
This fixes the following error: configuring ERROR at //infra/orchestrator/BUILD.gn:38:17: Could not read file. pydeps_file = "//third_party/blink/tools/merge_web_test_results.pydeps" ^-------------------------------------------------------- I resolved this to "/build/chromium-102.0.5005.27/third_party/blink/tools/merge_web_test_results.pydeps". See //infra/orchestrator/BUILD.gn:37:1: whence it was called. python_library("blink_merge_web_test_results_py") { ^-------------------------------------------------- See //BUILD.gn:89:5: which caused the file to be included. "//infra/orchestrator:orchestrator_all", ^-------------------------------------- It's a known upstream issue when building from the generated tarballs: - https://bugs.chromium.org/p/chromium/issues/detail?id=1313361 - https://chromium-review.googlesource.com/c/chromium/src/+/3457503
This commit is contained in:
parent
213febe39a
commit
73e094bf3c
|
@ -162,7 +162,11 @@ let
|
||||||
./patches/widevine-79.patch
|
./patches/widevine-79.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = optionalString (chromiumVersionAtLeast "102") ''
|
||||||
|
# Workaround/fix for https://bugs.chromium.org/p/chromium/issues/detail?id=1313361:
|
||||||
|
substituteInPlace BUILD.gn \
|
||||||
|
--replace '"//infra/orchestrator:orchestrator_all",' ""
|
||||||
|
'' + ''
|
||||||
# remove unused third-party
|
# remove unused third-party
|
||||||
for lib in ${toString gnSystemLibraries}; do
|
for lib in ${toString gnSystemLibraries}; do
|
||||||
if [ -d "third_party/$lib" ]; then
|
if [ -d "third_party/$lib" ]; then
|
||||||
|
|
Loading…
Reference in a new issue