Merge branch 'secondlife-debug' of github.com:secondlife/3p-webrtc-bu…

…ild into secondlife-debug
secondlife · Aug 12, 2024 · 498621d · 498621d
2 parents 1b4b1fc + 4961ef6
commit 498621d
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -54,11 +54,11 @@ jobs:
           # - macos_arm64
           - macos_x86_64
           # - ios
-    runs-on: macos-11
+    runs-on: macos-12
     steps:
     - uses: actions/checkout@v4
-    - name: Select Xcode 13.0
-      run: sudo xcode-select --switch /Applications/Xcode_13.0.app/Contents/Developer
+    - name: Select Xcode 14.0.1
+      run: sudo xcode-select --switch /Applications/Xcode_14.0.1.app/Contents/Developer
     - run: brew install ninja
     - run: ./build.${{ matrix.name }}.sh "${{ github.event.inputs.commitHash }}"
     - name: Upload Artifact

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -62,13 +62,13 @@ jobs:
           # - macos_arm64
           - macos_x86_64
           # - ios
-    runs-on: macos-11
+    runs-on: macos-12
     outputs:
       output-artifact-id: ${{ steps.artifact-upload-step.outputs.artifact-id }}
     steps:
     - uses: actions/checkout@v4
-    - name: Select Xcode 13.0
-      run: sudo xcode-select --switch /Applications/Xcode_13.0.app/Contents/Developer
+    - name: Select Xcode 14.0.1
+      run: sudo xcode-select --switch /Applications/Xcode_14.0.1.app/Contents/Developer
     - run: brew install ninja
     - name: Determine Release Tag
       env:
@@ -133,7 +133,7 @@ jobs:
   package-macos:
     needs:
     - build-macos
-    runs-on: macos-11 
+    runs-on: macos-12
     steps:
     - uses: secondlife/action-autobuild@v3
       with:

diff --git a/build/patches/crash_on_fatal_error.patch b/build/patches/crash_on_fatal_error.patch
@@ -1,8 +1,31 @@
 diff --git a/rtc_base/checks.cc b/rtc_base/checks.cc
-index e732a2659d..cbdd545ccb 100644
+index e732a2659d..606dd76bfe 100644
 --- a/rtc_base/checks.cc
 +++ b/rtc_base/checks.cc
-@@ -69,13 +69,26 @@ RTC_NORETURN void WriteFatalLog(absl::string_view output) {
+@@ -16,6 +16,7 @@
+ #include <cstdlib>
+
+ #include "absl/strings/string_view.h"
++#include "logging.h"
+
+ #if defined(WEBRTC_ANDROID)
+ #define RTC_LOG_TAG_ANDROID "rtc"
+@@ -24,6 +25,8 @@
+
+ #if defined(WEBRTC_WIN)
+ #include <windows.h>
++#else
++#include <unistd.h>
+ #endif
+
+ #if defined(WEBRTC_WIN)
+@@ -64,18 +67,33 @@ namespace webrtc_checks_impl {
+
+ #if !defined(WEBRTC_CHROMIUM_BUILD)
+ RTC_NORETURN void WriteFatalLog(absl::string_view output) {
+-#if defined(WEBRTC_ANDROID)
+   std::string output_str(output);
++#if defined(WEBRTC_ANDROID)
    __android_log_print(ANDROID_LOG_ERROR, RTC_LOG_TAG_ANDROID, "%s\n",
                        output_str.c_str());
  #endif
@@ -11,6 +34,8 @@ index e732a2659d..cbdd545ccb 100644
    fflush(stdout);
    fwrite(output.data(), output.size(), 1, stderr);
    fflush(stderr);
++  // attempt to notify the logging subsystem to broadcast to the sinks.
++  RTC_LOG(LS_ERROR) << output_str << "\n";
  #if defined(WEBRTC_WIN)
 -  DebugBreak();
 +//  DebugBreak();
@@ -25,7 +50,7 @@ index e732a2659d..cbdd545ccb 100644
 +#if defined(WEBRTC_WIN)
 +    _sleep(1);
 +#else
-+    sleep(1);
++    usleep(1);
 +#endif
 +  }
  }