Skip to content

[CMake][LibWebRTC] Fix build after 287395@main#37538

Merged
webkit-commit-queue merged 1 commit intoWebKit:mainfrom
philn:eng/284154
Dec 6, 2024
Merged

[CMake][LibWebRTC] Fix build after 287395@main#37538
webkit-commit-queue merged 1 commit intoWebKit:mainfrom
philn:eng/284154

Conversation

@philn
Copy link
Member

@philn philn commented Dec 6, 2024

@philn philn self-assigned this Dec 6, 2024
@philn philn added the New Bugs Unclassified bugs are placed in this component until the correct component can be determined. label Dec 6, 2024
@dpino
Copy link
Contributor

dpino commented Dec 6, 2024

I tested the patch on ARM. It's necessary to apply this fix:

diff --git a/Source/ThirdParty/libwebrtc/CMakeLists.txt b/Source/ThirdParty/libwebrtc/CMakeLists.txt
index 830859f043ce..705fdc2a2289 100644
--- a/Source/ThirdParty/libwebrtc/CMakeLists.txt
+++ b/Source/ThirdParty/libwebrtc/CMakeLists.txt
@@ -526,7 +526,6 @@ set(webrtc_SOURCES
     Source/third_party/boringssl/src/pki/signature_algorithm.cc
     Source/third_party/boringssl/src/pki/simple_path_builder_delegate.cc
     Source/third_party/boringssl/src/pki/string_util.cc
-    Source/third_party/boringssl/src/pki/test_helpers.cc
     Source/third_party/boringssl/src/pki/trust_store.cc
     Source/third_party/boringssl/src/pki/trust_store_collection.cc
     Source/third_party/boringssl/src/pki/trust_store_in_memory.cc

@philn philn added the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Dec 6, 2024
https://bugs.webkit.org/show_bug.cgi?id=284154

Unreviewed, update sources list after the BoringSSL version bump.

* Source/ThirdParty/libwebrtc/CMakeLists.txt:

Canonical link: https://commits.webkit.org/287445@main
@webkit-commit-queue
Copy link
Collaborator

Committed 287445@main (0b975d3): https://commits.webkit.org/287445@main

Reviewed commits have been landed. Closing PR #37538 and removing active labels.

@webkit-commit-queue webkit-commit-queue merged commit 0b975d3 into WebKit:main Dec 6, 2024
@webkit-commit-queue webkit-commit-queue removed the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Dec 6, 2024
@philn philn deleted the eng/284154 branch December 6, 2024 14:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

New Bugs Unclassified bugs are placed in this component until the correct component can be determined.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants