From ffb58606c5ab7181a25ef22776ae63fe8f77c79e Mon Sep 17 00:00:00 2001 From: cloudwebrtc Date: Tue, 29 Oct 2024 13:20:15 +0800 Subject: [PATCH] fix. --- webrtc-sys/build.rs | 1 - webrtc-sys/libwebrtc/build_android.sh | 1 - .../patches/android_use_libunwind.patch | 22 ------------------- 3 files changed, 24 deletions(-) delete mode 100644 webrtc-sys/libwebrtc/patches/android_use_libunwind.patch diff --git a/webrtc-sys/build.rs b/webrtc-sys/build.rs index 66380274..f5aa012b 100644 --- a/webrtc-sys/build.rs +++ b/webrtc-sys/build.rs @@ -186,7 +186,6 @@ fn main() { webrtc_sys_build::configure_jni_symbols().unwrap(); println!("cargo:rustc-link-lib=EGL"); - println!("cargo:rustc-link-lib=c++abi"); println!("cargo:rustc-link-lib=OpenSLES"); configure_android_sysroot(&mut builder); diff --git a/webrtc-sys/libwebrtc/build_android.sh b/webrtc-sys/libwebrtc/build_android.sh index 01778b20..228c2c50 100755 --- a/webrtc-sys/libwebrtc/build_android.sh +++ b/webrtc-sys/libwebrtc/build_android.sh @@ -70,7 +70,6 @@ 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 deleted file mode 100644 index e1e7e6c4..00000000 --- a/webrtc-sys/libwebrtc/patches/android_use_libunwind.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- 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) {