From d5a51a25b076134d0143ba889d607d2dbcd4b42c Mon Sep 17 00:00:00 2001 From: Andrey Lushnikov Date: Tue, 9 Feb 2021 08:49:59 -0800 Subject: [PATCH] devops: fix chromium-win build (#5378) - add missing build targets - do not copy *.pdb files in folders --- browser_patches/chromium/build.sh | 4 +++- browser_patches/chromium/buildwin.bat | 2 +- browser_patches/chromium/buildwingoma.bat | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/browser_patches/chromium/build.sh b/browser_patches/chromium/build.sh index 306d668f1a81d..0b404bba6f3d2 100755 --- a/browser_patches/chromium/build.sh +++ b/browser_patches/chromium/build.sh @@ -118,7 +118,8 @@ compile_chromium() { "nacl_irt_x86_64.nexe" "notification_helper.exe" "resources.pak" - "swiftshader" + "swiftshader/libEGL.dll" + "swiftshader/libGLESv2.dll" "v8_context_snapshot.bin" ) else @@ -202,6 +203,7 @@ EOF COPY_COMMAND="ditto" fi for file in ${CHROMIUM_FILES_TO_ARCHIVE[@]}; do + mkdir -p "output/${CHROMIUM_FOLDER_NAME}/$(dirname $file)" $COPY_COMMAND "${CR_CHECKOUT_PATH}/src/out/Default/${file}" "output/${CHROMIUM_FOLDER_NAME}/${file}" done if [[ $1 == "--compile-win"* ]]; then diff --git a/browser_patches/chromium/buildwin.bat b/browser_patches/chromium/buildwin.bat index 45f2328f1ffce..eec9a5c4129cc 100644 --- a/browser_patches/chromium/buildwin.bat +++ b/browser_patches/chromium/buildwin.bat @@ -1,2 +1,2 @@ CALL gn gen out/Default -CALL autoninja -C out/Default chrome +CALL autoninja -C out/Default chrome eventlog_provider diff --git a/browser_patches/chromium/buildwingoma.bat b/browser_patches/chromium/buildwingoma.bat index 2ae3174fc9abd..d834c5516fa6d 100644 --- a/browser_patches/chromium/buildwingoma.bat +++ b/browser_patches/chromium/buildwingoma.bat @@ -1,2 +1,2 @@ CALL gn gen out/Default -CALL ninja -j 200 -C out/Default chrome +CALL ninja -j 200 -C out/Default chrome eventlog_provider