revert changes.

livekit · Nov 28, 2024 · c60d376 · c60d376
1 parent 23bea75
commit c60d376
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/webrtc-sys/libwebrtc/build_android.sh b/webrtc-sys/libwebrtc/build_android.sh
@@ -70,6 +70,7 @@ cd src
 # git apply "$COMMAND_DIR/patches/add_licenses.patch" -v --ignore-space-change --ignore-whitespace --whitespace=nowarn
 git apply "$COMMAND_DIR/patches/ssl_verify_callback_with_native_handle.patch" -v --ignore-space-change --ignore-whitespace --whitespace=nowarn
 git apply "$COMMAND_DIR/patches/add_deps.patch" -v --ignore-space-change --ignore-whitespace --whitespace=nowarn
+git apply "$COMMAND_DIR/patches/android_use_libunwind.patch" -v --ignore-space-change --ignore-whitespace --whitespace=nowarn
 cd ..
 
 mkdir -p "$ARTIFACTS_DIR/lib"

diff --git a/webrtc-sys/libwebrtc/patches/android_use_libunwind.patch b/webrtc-sys/libwebrtc/patches/android_use_libunwind.patch
@@ -0,0 +1,22 @@
+--- src/buildtools/third_party/libunwind/BUILD.gn	2023-07-10 10:19:16
++++ src/buildtools/third_party/libunwind/BUILD.gn	2023-07-10 10:19:23
+@@ -20,7 +20,7 @@
+ }
+
+ source_set("libunwind") {
+-  visibility = []
++  visibility = ["//build/config:common_deps"]
+   if (is_fuchsia) {
+     visibility += [ "//buildtools/third_party/libc++abi" ]
+   } else if (is_android) {
+--- src/build/config/BUILD.gn	2023-07-10 10:23:49
++++ src/build/config/BUILD.gn	2023-07-10 10:23:54
+@@ -244,6 +244,8 @@
+
+   if (use_custom_libcxx) {
+     public_deps += [ "//buildtools/third_party/libc++" ]
++  } else {
++    public_deps += [ "//buildtools/third_party/libunwind" ]
+   }
+
+   if (use_afl) {