build: move libcc patches to electron repo (#14104)
In the GN build, libchromiumcontent is no longer a distinct library, but merely a container for a set of scripts and patches. Maintaining those patches in a separate repository is tedious and error-prone, so merge them into the main repo. Once this is merged and GN is the default way to build Electron, the libchromiumcontent repository can be archived.
This commit is contained in:
parent
9e85bdb02c
commit
76c5f5cc8a
147 changed files with 86931 additions and 6 deletions
36
patches/common/webrtc/webrtc-rwlock_null.patch
Normal file
36
patches/common/webrtc/webrtc-rwlock_null.patch
Normal file
|
@ -0,0 +1,36 @@
|
|||
diff --git a/rtc_base/synchronization/rw_lock_wrapper.cc b/rtc_base/synchronization/rw_lock_wrapper.cc
|
||||
index c8cd17edb8..50c6e25ad9 100644
|
||||
--- a/rtc_base/synchronization/rw_lock_wrapper.cc
|
||||
+++ b/rtc_base/synchronization/rw_lock_wrapper.cc
|
||||
@@ -11,6 +11,9 @@
|
||||
#include "rtc_base/synchronization/rw_lock_wrapper.h"
|
||||
|
||||
#include <assert.h>
|
||||
+#include <stdlib.h>
|
||||
+
|
||||
+#include "system_wrappers/include/sleep.h"
|
||||
|
||||
#if defined(_WIN32)
|
||||
#include "rtc_base/synchronization/rw_lock_win.h"
|
||||
@@ -21,11 +23,19 @@
|
||||
namespace webrtc {
|
||||
|
||||
RWLockWrapper* RWLockWrapper::CreateRWLock() {
|
||||
+ RWLockWrapper* rw_lock_ptr;
|
||||
#ifdef _WIN32
|
||||
- return RWLockWin::Create();
|
||||
+ rw_lock_ptr = RWLockWin::Create();
|
||||
#else
|
||||
- return RWLockPosix::Create();
|
||||
+ rw_lock_ptr = RWLockPosix::Create();
|
||||
#endif
|
||||
+ if (rw_lock_ptr != NULL) {
|
||||
+ return rw_lock_ptr;
|
||||
+ } else {
|
||||
+ int msec_wait = 10 + (rand() % 90);
|
||||
+ SleepMs(msec_wait);
|
||||
+ return CreateRWLock();
|
||||
+ }
|
||||
}
|
||||
|
||||
} // namespace webrtc
|
Loading…
Add table
Add a link
Reference in a new issue