td -> tde2e

Telegram/build/docker/centos_env/Dockerfile

@@ -808,37 +808,23 @@ RUN git clone -b v3.2.2 --depth=1 {{ GIT }}/ada-url/ada.git \
 	&& cd .. \
 	&& rm -rf ada
 
-FROM builder AS tdlib
+FROM builder AS tde2e
+COPY --link --from=zlib {{ LibrariesPath }}/zlib-cache /
 COPY --link --from=openssl {{ LibrariesPath }}/openssl-cache /
 
 # Shallow clone on a specific commit.
-RUN git init td \
+RUN git init tde2e \
-	&& cd td \
+	&& cd tde2e \
 	&& git remote add origin {{ GIT }}/tdlib/td.git \
-	&& git fetch --depth=1 origin f1b7500310baa496c0b779e4273a3aff0f14f42f \
+	&& git fetch --depth=1 origin 51743dfd01dff6179e2d8f7095729caa4e2222e9 \
 	&& git reset --hard FETCH_HEAD \
-	&& rm -rf .git \
+	&& cmake -GNinja -B build . \
-	&& env -u CFLAGS -u CXXFLAGS cmake -B out/Release . \
+		-DCMAKE_BUILD_TYPE=NONE \
-		-DCMAKE_BUILD_TYPE=Release \
+		-DTD_E2E_ONLY=ON \
-		-DCMAKE_C_FLAGS_RELEASE="$CFLAGS" \
+	&& cmake --build build --parallel \
-		-DCMAKE_C_FLAGS_DEBUG="{{ CFLAGS_DEBUG }}" \
+	&& DESTDIR="{{ LibrariesPath }}/tde2e-cache" cmake --install build \
-		-DCMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
+	&& cd .. \
-		-DCMAKE_CXX_FLAGS_DEBUG="{{ CFLAGS_DEBUG }}" \
+	&& rm -rf tde2e
-	&& cmake --build out/Release --config Release --target tde2e -j$(nproc)
-
-WORKDIR td
-
-{%- if DEBUG %}
-
-FROM tdlib AS tdlib_debug
-RUN env -u CFLAGS -u CXXFLAGS cmake -B out/Debug . \
-		-DCMAKE_BUILD_TYPE=Debug \
-		-DCMAKE_C_FLAGS_RELEASE="$CFLAGS" \
-		-DCMAKE_C_FLAGS_DEBUG="{{ CFLAGS_DEBUG }}" \
-		-DCMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
-		-DCMAKE_CXX_FLAGS_DEBUG="{{ CFLAGS_DEBUG }}" \
-	&& cmake --build out/Debug --config Debug --target tde2e -j$(nproc)
-{%- endif %}
 
 FROM builder
 COPY --link --from=zlib {{ LibrariesPath }}/zlib-cache /
@@ -887,10 +873,7 @@ COPY --link --from=webrtc_release {{ LibrariesPath }}/tg_owt/out/Release tg_owt/
 COPY --link --from=webrtc_debug {{ LibrariesPath }}/tg_owt/out/Debug tg_owt/out/Debug
 {%- endif %}
 COPY --link --from=ada {{ LibrariesPath }}/ada-cache /
-COPY --link --from=tdlib {{ LibrariesPath }}/td td
+COPY --link --from=tde2e {{ LibrariesPath }}/tde2e-cache /
-{%- if DEBUG %}
-COPY --link --from=tdlib_debug {{ LibrariesPath }}/td/out/Debug td/out/Debug
-{%- endif %}
 
 WORKDIR ../tdesktop
 ENV QT {{ QT }}

Telegram/build/prepare/prepare.py

@@ -1924,10 +1924,10 @@ win:
 #         -Dprotobuf_WITH_ZLIB_DEFAULT=OFF
 #     cmake --build . $MAKE_THREADS_CNT
 
-stage('td', """
+stage('tde2e', """
-    git clone https://github.com/tdlib/td.git
+    git clone https://github.com/tdlib/td.git tde2e
-    cd td
+    cd tde2e
-    git checkout f1b7500310
+    git checkout 51743df
 win:
     SET OPENSSL_DIR=%LIBS_DIR%\\openssl3
     SET OPENSSL_LIBS_DIR=%OPENSSL_DIR%\\out
@@ -1950,6 +1950,7 @@ win:
         -DCMAKE_EXE_LINKER_FLAGS="/SAFESEH:NO Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib %OPENSSL_LIBS_DIR%.dbg\\libssl.lib" ^
         -DCMAKE_SHARED_LINKER_FLAGS="/SAFESEH:NO Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib %OPENSSL_LIBS_DIR%.dbg\\libssl.lib" ^
         -DTD_ENABLE_MULTI_PROCESSOR_COMPILATION=ON ^
+        -DTD_E2E_ONLY=ON ^
         ../..
     cmake --build . --config Debug --target tde2e
 release:
@@ -1970,6 +1971,7 @@ release:
         -DCMAKE_EXE_LINKER_FLAGS="/SAFESEH:NO Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib %OPENSSL_LIBS_DIR%\\libssl.lib" ^
         -DCMAKE_SHARED_LINKER_FLAGS="/SAFESEH:NO Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib %OPENSSL_LIBS_DIR%\\libssl.lib" ^
         -DTD_ENABLE_MULTI_PROCESSOR_COMPILATION=ON ^
+        -DTD_E2E_ONLY=ON ^
         ../..
     cmake --build . --config Release --target tde2e
 mac:
@@ -1986,6 +1988,7 @@ mac:
             -DOPENSSL_CRYPTO_LIBRARY=$LIBS_DIR/openssl3/libcrypto.a \
             -DZLIB_FOUND=1 \
             -DZLIB_LIBRARIES=$USED_PREFIX/lib/libz.a \
+            -DTD_E2E_ONLY=ON \
             ../..
         cmake --build . --config $BUILD_CONFIG --target tde2e $MAKE_THREADS_CNT
         cd ../..

Telegram/cmake/td_tde2e.cmake

@@ -23,7 +23,7 @@ target_link_libraries(td_tde2e
 PUBLIC
     desktop-app::lib_base
 PRIVATE
-    desktop-app::external_td
+    desktop-app::external_tde2e
 )