Skip to content

Commit 498621d

Browse files
committed
Merge branch 'secondlife-debug' of github.com:secondlife/3p-webrtc-build into secondlife-debug
2 parents 1b4b1fc + 4961ef6 commit 498621d

File tree

3 files changed

+35
-10
lines changed

3 files changed

+35
-10
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ jobs:
5454
# - macos_arm64
5555
- macos_x86_64
5656
# - ios
57-
runs-on: macos-11
57+
runs-on: macos-12
5858
steps:
5959
- uses: actions/checkout@v4
60-
- name: Select Xcode 13.0
61-
run: sudo xcode-select --switch /Applications/Xcode_13.0.app/Contents/Developer
60+
- name: Select Xcode 14.0.1
61+
run: sudo xcode-select --switch /Applications/Xcode_14.0.1.app/Contents/Developer
6262
- run: brew install ninja
6363
- run: ./build.${{ matrix.name }}.sh "${{ github.event.inputs.commitHash }}"
6464
- name: Upload Artifact

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,13 @@ jobs:
6262
# - macos_arm64
6363
- macos_x86_64
6464
# - ios
65-
runs-on: macos-11
65+
runs-on: macos-12
6666
outputs:
6767
output-artifact-id: ${{ steps.artifact-upload-step.outputs.artifact-id }}
6868
steps:
6969
- uses: actions/checkout@v4
70-
- name: Select Xcode 13.0
71-
run: sudo xcode-select --switch /Applications/Xcode_13.0.app/Contents/Developer
70+
- name: Select Xcode 14.0.1
71+
run: sudo xcode-select --switch /Applications/Xcode_14.0.1.app/Contents/Developer
7272
- run: brew install ninja
7373
- name: Determine Release Tag
7474
env:
@@ -133,7 +133,7 @@ jobs:
133133
package-macos:
134134
needs:
135135
- build-macos
136-
runs-on: macos-11
136+
runs-on: macos-12
137137
steps:
138138
- uses: secondlife/action-autobuild@v3
139139
with:

build/patches/crash_on_fatal_error.patch

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,31 @@
11
diff --git a/rtc_base/checks.cc b/rtc_base/checks.cc
2-
index e732a2659d..cbdd545ccb 100644
2+
index e732a2659d..606dd76bfe 100644
33
--- a/rtc_base/checks.cc
44
+++ b/rtc_base/checks.cc
5-
@@ -69,13 +69,26 @@ RTC_NORETURN void WriteFatalLog(absl::string_view output) {
5+
@@ -16,6 +16,7 @@
6+
#include <cstdlib>
7+
8+
#include "absl/strings/string_view.h"
9+
+#include "logging.h"
10+
11+
#if defined(WEBRTC_ANDROID)
12+
#define RTC_LOG_TAG_ANDROID "rtc"
13+
@@ -24,6 +25,8 @@
14+
15+
#if defined(WEBRTC_WIN)
16+
#include <windows.h>
17+
+#else
18+
+#include <unistd.h>
19+
#endif
20+
21+
#if defined(WEBRTC_WIN)
22+
@@ -64,18 +67,33 @@ namespace webrtc_checks_impl {
23+
24+
#if !defined(WEBRTC_CHROMIUM_BUILD)
25+
RTC_NORETURN void WriteFatalLog(absl::string_view output) {
26+
-#if defined(WEBRTC_ANDROID)
27+
std::string output_str(output);
28+
+#if defined(WEBRTC_ANDROID)
629
__android_log_print(ANDROID_LOG_ERROR, RTC_LOG_TAG_ANDROID, "%s\n",
730
output_str.c_str());
831
#endif
@@ -11,6 +34,8 @@ index e732a2659d..cbdd545ccb 100644
1134
fflush(stdout);
1235
fwrite(output.data(), output.size(), 1, stderr);
1336
fflush(stderr);
37+
+ // attempt to notify the logging subsystem to broadcast to the sinks.
38+
+ RTC_LOG(LS_ERROR) << output_str << "\n";
1439
#if defined(WEBRTC_WIN)
1540
- DebugBreak();
1641
+// DebugBreak();
@@ -25,7 +50,7 @@ index e732a2659d..cbdd545ccb 100644
2550
+#if defined(WEBRTC_WIN)
2651
+ _sleep(1);
2752
+#else
28-
+ sleep(1);
53+
+ usleep(1);
2954
+#endif
3055
+ }
3156
}

0 commit comments

Comments
 (0)