Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios

.gitmodules

@@ -16,7 +16,7 @@ url=https://github.com/bazelbuild/rules_apple.git
 	url = https://github.com/telegramdesktop/libtgvoip.git
 [submodule "build-system/tulsi"]
 	path = build-system/tulsi
-	url = https://github.com/ali-fareed/tulsi.git
+url=https://github.com/bazelbuild/tulsi.git
 [submodule "third-party/depot_tools"]
 	path = third-party/depot_tools
 	url = https://chromium.googlesource.com/chromium/tools/depot_tools.git

WORKSPACE

@@ -2,9 +2,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file"
 
 http_archive(
     name = "com_google_protobuf",
-    urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.8.0.zip"],
-    sha256 = "1e622ce4b84b88b6d2cdf1db38d1a634fe2392d74f0b7b74ff98f3a51838ee53",
-    strip_prefix = "protobuf-3.8.0",
+    urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.14.0.zip"],
+    sha256 = "bf0e5070b4b99240183b29df78155eee335885e53a8af8683964579c214ad301",
+    strip_prefix = "protobuf-3.14.0",
     type = "zip",
 )
 

build-system/bazel-rules/rules_apple

@@ -1 +1 @@
-Subproject commit 21c0ca93b0cd44e7eb500a1c02729a08b496b6c2
+Subproject commit e2b1e1e4399bd168a00d1c3125eaa3ae52835340

build-system/bazel-rules/rules_swift

@@ -1 +1 @@
-Subproject commit ed81c15f9b577880c13b987101100cbac03f45c2
+Subproject commit eca50db5a95a50b2be8367d644aebf4d1d880c52

build-system/generate-xcode-project.sh

@@ -14,6 +14,15 @@ if [ "$BAZEL" = "" ]; then
 	exit 1
 fi
 
+BAZEL_x86_64="$BAZEL"
+if [ "$(arch)" == "arm64" ]; then
+	BAZEL_x86_64="$(which bazel_x86_64)"
+fi
+if [ "$BAZEL_x86_64" = "" ]; then
+	echo "bazel_x86_64 not found in PATH"
+	exit 1
+fi
+
 XCODE_VERSION=$(cat "build-system/xcode_version")
 INSTALLED_XCODE_VERSION=$(echo `plutil -p \`xcode-select -p\`/../Info.plist | grep -e CFBundleShortVersionString | sed 's/[^0-9\.]*//g'`)
 
@@ -36,7 +45,7 @@ rm -rf "$GEN_DIRECTORY/${APP_TARGET}.tulsiproj"
 rm -rf "$TULSI_APP"
 
 pushd "build-system/tulsi"
-"$BAZEL" build //:tulsi --xcode_version="$XCODE_VERSION"
+"$BAZEL_x86_64" build //:tulsi --xcode_version="$XCODE_VERSION" --use_top_level_targets_for_symlinks
 popd
 
 mkdir -p "$TULSI_DIRECTORY"

build-system/tulsi

@@ -1 +1 @@
-Subproject commit e890fb6c88846454c4f69abd8d265a302c0e80e4
+Subproject commit b965114f31a464185318c71ef3d0c1538d0c52de

third-party/libvpx/BUILD

@@ -59,7 +59,7 @@ genrule(
 
     mkdir -p "$$BUILD_DIR/Public/libvpx"
 
-    sh $$BUILD_DIR/build-libvpx-bazel.sh $$BUILD_ARCH "$$BUILD_DIR/libvpx" "$$BUILD_DIR"
+    arch -x86_64 sh $$BUILD_DIR/build-libvpx-bazel.sh $$BUILD_ARCH "$$BUILD_DIR/libvpx" "$$BUILD_DIR"
     """ +
     "\n".join([
         "cp -f \"$$BUILD_DIR/VPX.framework/Headers/vpx/{}\" \"$(location Public/vpx/{})\"".format(header, header) for header in headers

third-party/mozjpeg/BUILD

@@ -55,7 +55,7 @@ genrule(
 
     mkdir -p "$$BUILD_DIR/Public/mozjpeg"
 
-    PATH="$$PATH:$$CMAKE_DIR/cmake-3.18.4-Darwin-x86_64/CMake.app/Contents/bin" sh $$BUILD_DIR/build-mozjpeg-bazel.sh $$BUILD_ARCH "$$BUILD_DIR/mozjpeg" "$$BUILD_DIR"
+    PATH="$$PATH:$$CMAKE_DIR/cmake-3.18.4-Darwin-x86_64/CMake.app/Contents/bin" arch -x86_64 sh $$BUILD_DIR/build-mozjpeg-bazel.sh $$BUILD_ARCH "$$BUILD_DIR/mozjpeg" "$$BUILD_DIR"
     """ +
     "\n".join([
         "cp -f \"$$BUILD_DIR/mozjpeg/{}\" \"$(location Public/mozjpeg/{})\"".format(header, header) for header in headers

third-party/yasm/BUILD

@@ -23,8 +23,8 @@ set -x
     pushd "$$BUILD_DIR/yasm-1.3.0"
     mkdir build
     cd build
-    PATH="$$PATH:$$CMAKE_DIR/cmake-3.18.4-Darwin-x86_64/CMake.app/Contents/bin" cmake .. -DYASM_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF
-    make -j $$core_count
+    PATH="$$PATH:$$CMAKE_DIR/cmake-3.18.4-Darwin-x86_64/CMake.app/Contents/bin" arch -x86_64 cmake .. -DYASM_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF
+    arch -x86_64 make -j $$core_count
     popd
 
     tar -cf "$(location yasm.tar)" -C "$$BUILD_DIR/yasm-1.3.0/build" .