diff --git a/webrtc-sys/libwebrtc/build_android.sh b/webrtc-sys/libwebrtc/build_android.sh index f5cd4749..9782486d 100755 --- a/webrtc-sys/libwebrtc/build_android.sh +++ b/webrtc-sys/libwebrtc/build_android.sh @@ -117,6 +117,7 @@ ninja -C "$OUTPUT_DIR" :default \ # make libwebrtc.a # don't include nasm ar -rc "$ARTIFACTS_DIR/lib/libwebrtc.a" `find "$OUTPUT_DIR/obj" -name '*.o' -not -path "*/third_party/nasm/*"` +objcopy --redefine-syms="$COMMAND_DIR/libyuv_prefix_symbols.txt" "$ARTIFACTS_DIR/lib/libwebrtc.a" python3 "./src/tools_webrtc/libs/generate_licenses.py" \ --target :default "$OUTPUT_DIR" "$OUTPUT_DIR" diff --git a/webrtc-sys/libwebrtc/build_ios.sh b/webrtc-sys/libwebrtc/build_ios.sh index 7d0f8957..1155c09d 100755 --- a/webrtc-sys/libwebrtc/build_ios.sh +++ b/webrtc-sys/libwebrtc/build_ios.sh @@ -128,6 +128,7 @@ ninja -C "$OUTPUT_DIR" :default \ # make libwebrtc.a # don't include nasm ar -rc "$ARTIFACTS_DIR/lib/libwebrtc.a" `find "$OUTPUT_DIR/obj" -name '*.o' -not -path "*/third_party/nasm/*"` +objcopy --redefine-syms="$COMMAND_DIR/libyuv_prefix_symbols.txt" "$ARTIFACTS_DIR/lib/libwebrtc.a" python3 "./src/tools_webrtc/libs/generate_licenses.py" \ --target :webrtc "$OUTPUT_DIR" "$OUTPUT_DIR" diff --git a/webrtc-sys/libwebrtc/build_linux.sh b/webrtc-sys/libwebrtc/build_linux.sh index 3aae1107..e0265ab6 100755 --- a/webrtc-sys/libwebrtc/build_linux.sh +++ b/webrtc-sys/libwebrtc/build_linux.sh @@ -118,6 +118,7 @@ ninja -C "$OUTPUT_DIR" :default # don't include nasm ar -rc "$ARTIFACTS_DIR/lib/libwebrtc.a" `find "$OUTPUT_DIR/obj" -name '*.o' -not -path "*/third_party/nasm/*"` objcopy --redefine-syms="$COMMAND_DIR/boringssl_prefix_symbols.txt" "$ARTIFACTS_DIR/lib/libwebrtc.a" +objcopy --redefine-syms="$COMMAND_DIR/libyuv_prefix_symbols.txt" "$ARTIFACTS_DIR/lib/libwebrtc.a" python3 "./src/tools_webrtc/libs/generate_licenses.py" \ --target :default "$OUTPUT_DIR" "$OUTPUT_DIR" diff --git a/webrtc-sys/libwebrtc/build_macos.sh b/webrtc-sys/libwebrtc/build_macos.sh index e7c0fdbe..b739115f 100755 --- a/webrtc-sys/libwebrtc/build_macos.sh +++ b/webrtc-sys/libwebrtc/build_macos.sh @@ -118,6 +118,7 @@ ninja -C "$OUTPUT_DIR" :default \ # make libwebrtc.a # don't include nasm ar -rc "$ARTIFACTS_DIR/lib/libwebrtc.a" `find "$OUTPUT_DIR/obj" -name '*.o' -not -path "*/third_party/nasm/*"` +objcopy --redefine-syms="$COMMAND_DIR/libyuv_prefix_symbols.txt" "$ARTIFACTS_DIR/lib/libwebrtc.a" python3 "./src/tools_webrtc/libs/generate_licenses.py" \ --target :webrtc "$OUTPUT_DIR" "$OUTPUT_DIR" diff --git a/webrtc-sys/libwebrtc/libyuv_prefix_symbols.txt b/webrtc-sys/libwebrtc/libyuv_prefix_symbols.txt new file mode 100644 index 00000000..fd749745 --- /dev/null +++ b/webrtc-sys/libwebrtc/libyuv_prefix_symbols.txt @@ -0,0 +1,10 @@ +# webrtc m125_release now exports libyuv symbols, which are already handled with +# the yuv-sys crate. this reƫxports them under a different name. +ARGBToABGRRow_C RTC_ARGBToABGRRow_C +ARGBToBGRARow_C RTC_ARGBToBGRARow_C +ARGBToRGBARow_C RTC_ARGBToRGBARow_C +RGBAToARGBRow_C RTC_RGBAToARGBRow_C +AR64ToAB64Row_C RTC_AR64ToAB64Row_C +YUY2ToARGBMatrix RTC_YUY2ToARGBMatrix +UYVYToARGBMatrix RTC_UYVYToARGBMatrix +