diff --git a/third-party/webrtc/BUCK b/third-party/webrtc/BUCK
index 438e4ab424..6762598ed0 100644
--- a/third-party/webrtc/BUCK
+++ b/third-party/webrtc/BUCK
@@ -15,16 +15,38 @@ genrule(
     set -x
     echo "SRCDIR=$SRCDIR"
 
-    OUT_DIR="ios"
-
     BUILD_ARCH=arm64
 
-    BUILD_DIR="$SRCDIR/$BUILD_ARCH"
+    BUILD_DIR_ARM64="$SRCDIR/$BUILD_ARCH"
+
+    BUILD_DIR="$BUILD_DIR_ARM64"
+    rm -rf "$BUILD_DIR"
+    mkdir -p "$BUILD_DIR"
+
+    mkdir -p "$BUILD_DIR/webrtc-ios"
+    cp -R "$SRCDIR/webrtc-ios/src" "$BUILD_DIR/webrtc-ios/src"
+
+    DEPOT_TOOLS_PATH="$(location //third-party:depot_tools_sources)"
+
+    rm -rf "$BUILD_DIR/depot_tools"
+    cp -R "$DEPOT_TOOLS_PATH" "$BUILD_DIR/"
+
+    rm -rf "$BUILD_DIR/openssl"
+    cp -R "$(location //submodules/openssl:openssl_build_merged)" "$BUILD_DIR/openssl/"
+    cp -R "$(location //submodules/openssl:openssl_libssl_merged)" "$BUILD_DIR/libssl/"
+
+    sh $SRCDIR/build-webrtc-buck.sh "$BUILD_DIR" $BUILD_ARCH
+
+    BUILD_ARCH=arm
+
+    BUILD_DIR_ARMV7="$SRCDIR/$BUILD_ARCH"
+
+    BUILD_DIR="$BUILD_DIR_ARMV7"
+
     rm -rf "$BUILD_DIR"
     mkdir -p "$BUILD_DIR"
 
     mkdir -p "$BUILD_DIR/webrtc-ios"
-    cp -R "$SRCDIR/webrtc-ios/.git" "$BUILD_DIR/webrtc-ios/.git"
     cp -R "$SRCDIR/webrtc-ios/src" "$BUILD_DIR/webrtc-ios/src"
 
     DEPOT_TOOLS_PATH="$(location //third-party:depot_tools_sources)"
@@ -39,7 +61,7 @@ genrule(
     sh $SRCDIR/build-webrtc-buck.sh "$BUILD_DIR" $BUILD_ARCH
 
     mkdir -p "$OUT"
-    cp "$BUILD_DIR/webrtc-ios/src/out/$OUT_DIR/obj/sdk/libframework_objc_static.a" "$OUT/"
+    lipo -create "$BUILD_DIR_ARMV7/webrtc-ios/src/out/ios/obj/sdk/libframework_objc_static.a" "$BUILD_DIR_ARM64/webrtc-ios/src/out/ios_64/obj/sdk/libframework_objc_static.a" -output "$OUT/libframework_objc_static.a"
 """,
     out = "libwebrtc",
     visibility = ["PUBLIC"]
diff --git a/third-party/webrtc/build-webrtc-buck.sh b/third-party/webrtc/build-webrtc-buck.sh
index 214fa403ea..f1c895666d 100755
--- a/third-party/webrtc/build-webrtc-buck.sh
+++ b/third-party/webrtc/build-webrtc-buck.sh
@@ -21,7 +21,9 @@ mv openssl/lib/libcrypto.a openssl/
 mv libssl/lib/libssl.a openssl/
 
 OUT_DIR="ios"
-if [ "$ARCH" == "x64" ]; then
+if [ "$ARCH" == "arm64" ]; then
+  OUT_DIR="ios_64"
+elif [ "$ARCH" == "x64" ]; then
   OUT_DIR="ios_sim"
 fi